MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-10-30 00:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

xl: DeleteObject regression over errChannel. (#1521)

Browse Source 
DeleteObject would hang indefinitely - fix it.
This commit is contained in:
Harshavardhana 2016-05-07 12:48:12 -07:00 committed by Anand Babu (AB) Periasamy
parent 091c1e8456
commit bf563afb80
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xl-objects.go
View File

@ -284,19 +284,24 @@ func (xl xlObjects) DeleteObject(bucket, object string) error {
} }
// Range through all files and delete it. // Range through all files and delete it.
var wg = &sync.WaitGroup{} var wg = &sync.WaitGroup{}
var errChs = make([]chan error, len(info.Parts)) var errs = make([]error, len(info.Parts))
for _, part := range info.Parts { for index, part := range info.Parts {
wg.Add(1) wg.Add(1)
go func(part MultipartPartInfo) { // Start deleting parts in routine.
go func(index int, part MultipartPartInfo) {
defer wg.Done() defer wg.Done()
err = xl.storage.DeleteFile(bucket, pathJoin(object, partNumToPartFileName(part.PartNumber))) partFileName := partNumToPartFileName(part.PartNumber)
errChs[part.PartNumber-1] <- err errs[index] = xl.storage.DeleteFile(bucket, pathJoin(object, partFileName))
}(part) }(index, part)
} }
// Wait for all the deletes to finish.
wg.Wait() wg.Wait()
for _, errCh := range errChs { // Loop through and validate if any errors, return back the first
if err = <-errCh; err != nil { // error occurred.
return toObjectErr(err, bucket, object) for index, err := range errs {
if err != nil {
partFileName := partNumToPartFileName(info.Parts[index].PartNumber)
return toObjectErr(err, bucket, pathJoin(object, partFileName))
} }
} }
err = xl.storage.DeleteFile(bucket, pathJoin(object, multipartMetaFile)) err = xl.storage.DeleteFile(bucket, pathJoin(object, multipartMetaFile))