aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-08-08 21:37:36 -0700
committerChris Lu <chris.lu@gmail.com>2020-08-08 21:37:36 -0700
commit9832653e1d3c6a4382b12ce5ccd55f2374bddeb6 (patch)
tree3153c835344b83db4e68be3dc36b6a89651622bf
parent3b1a95ac26debb3080794bf8605ea2d5636818c7 (diff)
downloadseaweedfs-9832653e1d3c6a4382b12ce5ccd55f2374bddeb6.tar.xz
seaweedfs-9832653e1d3c6a4382b12ce5ccd55f2374bddeb6.zip
FUSE mount: proper error with deleting non empty folder
-rw-r--r--weed/filesys/dir.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go
index 2214b1ac7..843ada866 100644
--- a/weed/filesys/dir.go
+++ b/weed/filesys/dir.go
@@ -334,7 +334,10 @@ 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)
if err != nil {
- glog.V(3).Infof("not found remove %s/%s: %v", dir.FullPath(), req.Name, err)
+ glog.V(3).Infof("remove %s/%s: %v", dir.FullPath(), req.Name, err)
+ if strings.Contains(err.Error(), "non-empty"){
+ return fuse.EEXIST
+ }
return fuse.ENOENT
}