fix: move context timeout closer to network for Delete calls (#10897)

allowing for disconnects to be limited to the drive
themselves instead of disconnecting all drives.
This commit is contained in:
Harshavardhana
2020-11-13 16:56:45 -08:00
committed by GitHub
parent 0784a0c33a
commit 17a5ff51ff
3 changed files with 15 additions and 10 deletions
+1 -8
View File
@@ -24,7 +24,6 @@ import (
"net/http"
"path"
"sync"
"time"
"github.com/minio/minio-go/v7/pkg/tags"
xhttp "github.com/minio/minio/cmd/http"
@@ -774,13 +773,7 @@ func (er erasureObjects) deleteObject(ctx context.Context, bucket, object string
if disks[index] == nil {
return errDiskNotFound
}
tctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
err := cleanupDir(tctx, disks[index], minioMetaTmpBucket, tmpObj)
if err != nil && err != errVolumeNotFound {
return err
}
return nil
return cleanupDir(ctx, disks[index], minioMetaTmpBucket, tmpObj)
}, index)
}