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

filer: filer.copy cleanup in case of failed uploads

Browse Source
This commit is contained in:
Chris Lu
2019-10-24 10:16:01 -07:00
parent 1b71608b3c
commit 9573c0f4b3
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
weed/command/filer_copy.go
View File

@@ -400,15 +400,21 @@ func (worker *FileCopyWorker) uploadFileInChunks(ctx context.Context, task FileC
wg.Wait() wg.Wait()
close(chunksChan) close(chunksChan)
if uploadError != nil {
return uploadError
}
var chunks []*filer_pb.FileChunk var chunks []*filer_pb.FileChunk
for chunk := range chunksChan { for chunk := range chunksChan {
chunks = append(chunks, chunk) chunks = append(chunks, chunk)
} }
if uploadError != nil {
var fileIds []string
for _, chunk := range chunks {
fileIds = append(fileIds, chunk.FileId)
}
operation.DeleteFiles(worker.options.masterClient.GetMaster(), worker.options.grpcDialOption, fileIds)
return uploadError
}
if err := withFilerClient(ctx, worker.filerGrpcAddress, worker.options.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { if err := withFilerClient(ctx, worker.filerGrpcAddress, worker.options.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
request := &filer_pb.CreateEntryRequest{ request := &filer_pb.CreateEntryRequest{
Directory: task.destinationUrlPath, Directory: task.destinationUrlPath,