gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

correctly recursively delete folders

Browse source
This commit is contained in:
Chris Lu 2018-08-01 01:26:41 -07:00
parent fa3ded4134
commit c81f1cda47
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
weed/filer2/filer.go
View file

@ -13,6 +13,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/wdclient" "github.com/chrislusf/seaweedfs/weed/wdclient"
"github.com/karlseguin/ccache" "github.com/karlseguin/ccache"
"math"
) )
type Filer struct { type Filer struct {
@ -141,7 +142,11 @@ func (f *Filer) DeleteEntryMetaAndData(p FullPath, isRecursive bool, shouldDelet
} }
if entry.IsDirectory() { if entry.IsDirectory() {
entries, err := f.ListDirectoryEntries(p, "", false, 1) limit := int(1)
if isRecursive {
limit = math.MaxInt32
}
entries, err := f.ListDirectoryEntries(p, "", false, limit)
if err != nil { if err != nil {
return fmt.Errorf("list folder %s: %v", p, err) return fmt.Errorf("list folder %s: %v", p, err)
} }
@ -161,6 +166,10 @@ func (f *Filer) DeleteEntryMetaAndData(p FullPath, isRecursive bool, shouldDelet
f.deleteChunks(entry.Chunks) f.deleteChunks(entry.Chunks)
} }
if p == "/" {
return nil
}
glog.V(0).Infof("deleting entry %v", p)
return f.store.DeleteEntry(p) return f.store.DeleteEntry(p)
} }