aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-03-26 02:21:30 -0700
committerChris Lu <chris.lu@gmail.com>2020-03-26 02:21:30 -0700
commit712720864d989b2c5a5b0c5b9667d1e2e3356fdf (patch)
treee8e09e242a583de4806bd2e23ff24c4a143eab03
parent8d9a76005dfeae1baeea274f40fa13bc490eb38d (diff)
downloadseaweedfs-712720864d989b2c5a5b0c5b9667d1e2e3356fdf.tar.xz
seaweedfs-712720864d989b2c5a5b0c5b9667d1e2e3356fdf.zip
error checking for remove
-rw-r--r--weed/pb/filer_pb/filer_client.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/weed/pb/filer_pb/filer_client.go b/weed/pb/filer_pb/filer_client.go
index fd88d3d77..c5d863262 100644
--- a/weed/pb/filer_pb/filer_client.go
+++ b/weed/pb/filer_pb/filer_client.go
@@ -2,6 +2,7 @@ package filer_pb
import (
"context"
+ "errors"
"fmt"
"io"
"math"
@@ -207,7 +208,7 @@ func MkFile(filerClient FilerClient, parentDirectoryPath string, fileName string
func Remove(filerClient FilerClient, parentDirectoryPath string, name string, isDeleteData, isRecursive, ignoreRecursiveErr bool) error {
return filerClient.WithFilerClient(func(client SeaweedFilerClient) error {
- if _, err := client.DeleteEntry(context.Background(), &DeleteEntryRequest{
+ if resp, err := client.DeleteEntry(context.Background(), &DeleteEntryRequest{
Directory: parentDirectoryPath,
Name: name,
IsDeleteData: isDeleteData,
@@ -215,6 +216,10 @@ func Remove(filerClient FilerClient, parentDirectoryPath string, name string, is
IgnoreRecursiveError: ignoreRecursiveErr,
}); err != nil {
return err
+ } else {
+ if resp.Error != "" {
+ return errors.New(resp.Error)
+ }
}
return nil