gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

S3 API: fix DeleteMultipleObjectsHandler

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/1241
This commit is contained in:
Chris Lu
2020-03-20 14:17:31 -07:00
parent 165b0d22a4
commit c4bea45099
10 changed files with 173 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
weed/server/filer_grpc_server.go
View File

@@ -226,25 +226,6 @@ func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer_pb.DeleteEntr
return resp, nil
}
func (fs *FilerServer) StreamDeleteEntries(stream filer_pb.SeaweedFiler_StreamDeleteEntriesServer) error {
for {
req, err := stream.Recv()
if err != nil {
return fmt.Errorf("receive delete entry request: %v", err)
}
fullpath := filer2.FullPath(filepath.ToSlash(filepath.Join(req.Directory, req.Name)))
err = fs.filer.DeleteEntryMetaAndData(context.Background(), fullpath, req.IsRecursive, req.IgnoreRecursiveError, req.IsDeleteData)
resp := &filer_pb.DeleteEntryResponse{}
if err != nil {
resp.Error = err.Error()
}
if err := stream.Send(resp); err != nil {
return err
}
}
return nil
}
func (fs *FilerServer) AssignVolume(ctx context.Context, req *filer_pb.AssignVolumeRequest) (resp *filer_pb.AssignVolumeResponse, err error) {
ttlStr := ""