This commit is contained in:
Chris Lu
2020-10-07 23:30:54 -07:00
parent e91b9c85a2
commit 62d3d3aea0
4 changed files with 30 additions and 31 deletions

View File

@@ -77,7 +77,7 @@ func (f *Filer) doBatchDeleteFolderMetaAndData(ctx context.Context, entry *Entry
if lastFileName == "" && !isRecursive && len(entries) > 0 { if lastFileName == "" && !isRecursive && len(entries) > 0 {
// only for first iteration in the loop // only for first iteration in the loop
glog.Errorf("deleting a folder %s has children: %+v ...", entry.FullPath, entries[0].Name()) glog.Errorf("deleting a folder %s has children: %+v ...", entry.FullPath, entries[0].Name())
return nil, nil,fmt.Errorf("fail to delete non-empty folder: %s", entry.FullPath) return nil, nil, fmt.Errorf("fail to delete non-empty folder: %s", entry.FullPath)
} }
for _, sub := range entries { for _, sub := range entries {

View File

@@ -6,7 +6,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
) )
const( const (
S3TAG_PREFIX = "s3-" S3TAG_PREFIX = "s3-"
) )

View File

@@ -177,4 +177,3 @@ func (ms *MasterServer) LookupEcVolume(ctx context.Context, req *master_pb.Looku
return resp, nil return resp, nil
} }