diff options
| author | joeslay <54322500+joeslay@users.noreply.github.com> | 2019-09-12 11:44:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 11:44:09 +0100 |
| commit | d8c34b032fb6dbfb89359da6e5e002429ad42fc2 (patch) | |
| tree | e86503ec3329f811a0604f42fb2a85b1a9b49efa /weed/filer2/filer.go | |
| parent | c1a928887a0da5825b7ba36ddb0530951eb6ee9a (diff) | |
| parent | ae53f636804e41c2c7a0817e8f35434a00b6eacb (diff) | |
| download | seaweedfs-d8c34b032fb6dbfb89359da6e5e002429ad42fc2.tar.xz seaweedfs-d8c34b032fb6dbfb89359da6e5e002429ad42fc2.zip | |
Merge pull request #6 from chrislusf/master
merge seaweed master
Diffstat (limited to 'weed/filer2/filer.go')
| -rw-r--r-- | weed/filer2/filer.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go index d86090e62..55b78567b 100644 --- a/weed/filer2/filer.go +++ b/weed/filer2/filer.go @@ -203,7 +203,7 @@ func (f *Filer) FindEntry(ctx context.Context, p FullPath) (entry *Entry, err er return f.store.FindEntry(ctx, p) } -func (f *Filer) DeleteEntryMetaAndData(ctx context.Context, p FullPath, isRecursive bool, shouldDeleteChunks bool) (err error) { +func (f *Filer) DeleteEntryMetaAndData(ctx context.Context, p FullPath, isRecursive bool, ignoreRecursiveError, shouldDeleteChunks bool) (err error) { entry, err := f.FindEntry(ctx, p) if err != nil { return err @@ -230,8 +230,8 @@ func (f *Filer) DeleteEntryMetaAndData(ctx context.Context, p FullPath, isRecurs if isRecursive { for _, sub := range entries { lastFileName = sub.Name() - err = f.DeleteEntryMetaAndData(ctx, sub.FullPath, isRecursive, shouldDeleteChunks) - if err != nil { + err = f.DeleteEntryMetaAndData(ctx, sub.FullPath, isRecursive, ignoreRecursiveError, shouldDeleteChunks) + if err != nil && !ignoreRecursiveError { return err } limit-- |