From b06785316264a63f8a1dc926ddf1a5f6cc6b7926 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 8 Oct 2020 21:55:55 -0700 Subject: [PATCH] mount: ignore recursion error fix https://github.com/chrislusf/seaweedfs/issues/1514 the host OS should manage recursive deletion. --- weed/filesys/dir.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 574749ef0..4dede3a8b 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -354,7 +354,8 @@ func (dir *Dir) removeOneFile(req *fuse.RemoveRequest) error { func (dir *Dir) removeFolder(req *fuse.RemoveRequest) error { glog.V(3).Infof("remove directory entry: %v", req) - err := filer_pb.Remove(dir.wfs, dir.FullPath(), req.Name, true, false, false, false, []int32{dir.wfs.signature}) + ignoreRecursiveErr := true // ignore recursion error since the OS should manage it + err := filer_pb.Remove(dir.wfs, dir.FullPath(), req.Name, true, false, ignoreRecursiveErr, false, []int32{dir.wfs.signature}) if err != nil { glog.V(0).Infof("remove %s/%s: %v", dir.FullPath(), req.Name, err) if strings.Contains(err.Error(), "non-empty") {