aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-03-23 01:14:42 -0700
committerChris Lu <chris.lu@gmail.com>2020-03-23 01:14:42 -0700
commita5aa8be19bbf9d0ef9e6668334a0521618739f4a (patch)
treea92e2d712db10d61a4ed22bb6f9ef5f47ff5b34c
parent7f1e3c843ddc8d6880985f0a32f37cfb19b27c3c (diff)
downloadseaweedfs-a5aa8be19bbf9d0ef9e6668334a0521618739f4a.tar.xz
seaweedfs-a5aa8be19bbf9d0ef9e6668334a0521618739f4a.zip
Update webdav_server.go
-rw-r--r--weed/server/webdav_server.go16
1 files changed, 1 insertions, 15 deletions
diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go
index 9ee49f4ee..4acff454b 100644
--- a/weed/server/webdav_server.go
+++ b/weed/server/webdav_server.go
@@ -255,23 +255,9 @@ func (fs *WebDavFileSystem) removeAll(ctx context.Context, fullFilePath string)
//_, err = fs.db.Exec(`delete from filesystem where fullFilePath = ?`, fullFilePath)
}
dir, name := util.FullPath(fullFilePath).DirAndName()
- err = fs.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {
- request := &filer_pb.DeleteEntryRequest{
- Directory: dir,
- Name: name,
- IsDeleteData: true,
- }
-
- glog.V(3).Infof("removing entry: %v", request)
- _, err := client.DeleteEntry(ctx, request)
- if err != nil {
- return fmt.Errorf("remove %s: %v", fullFilePath, err)
- }
+ return filer_pb.Remove(fs, dir, name, true, true, true)
- return nil
- })
- return err
}
func (fs *WebDavFileSystem) RemoveAll(ctx context.Context, name string) error {