gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid using empty fileId to delete

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/183
This commit is contained in:
chrislusf
2015-08-21 14:09:33 -07:00
parent 1c6729d4c1
commit 91db227b27
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go/filer/embedded_filer/files_in_leveldb.go
View File

@@ -43,6 +43,9 @@ func (fl *FileListInLevelDb) CreateFile(dirId filer.DirectoryId, fileName string
} }
func (fl *FileListInLevelDb) DeleteFile(dirId filer.DirectoryId, fileName string) (fid string, err error) { func (fl *FileListInLevelDb) DeleteFile(dirId filer.DirectoryId, fileName string) (fid string, err error) {
if fid, err = fl.FindFile(dirId, fileName); err != nil { if fid, err = fl.FindFile(dirId, fileName); err != nil {
if err == leveldb.ErrNotFound {
return "", nil
}
return return
} }
err = fl.db.Delete(genKey(dirId, fileName), nil) err = fl.db.Delete(genKey(dirId, fileName), nil)

2
go/weed/weed_server/filer_server_handlers.go
View File

@@ -209,7 +209,7 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) {
err = fs.filer.DeleteDirectory(r.URL.Path, isRecursive) err = fs.filer.DeleteDirectory(r.URL.Path, isRecursive)
} else { } else {
fid, err = fs.filer.DeleteFile(r.URL.Path) fid, err = fs.filer.DeleteFile(r.URL.Path)
if err == nil { if err == nil && fid != "" {
err = operation.DeleteFile(fs.master, fid, fs.jwt(fid)) err = operation.DeleteFile(fs.master, fid, fs.jwt(fid))
} }
} }