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

on quorum DeleteObject() errors attempt an MRF (#16932)

Browse Source
This commit is contained in:
Harshavardhana 2023-03-31 08:15:41 -07:00 committed by GitHub
parent a7b7860e0e
commit 216a471bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/erasure-object.go
View File

@ -1478,8 +1478,11 @@ func (er erasureObjects) DeleteObjects(ctx context.Context, bucket string, objec
// Check failed deletes across multiple objects // Check failed deletes across multiple objects
for i, dobj := range dobjects { for i, dobj := range dobjects {
// This object errored, no need to attempt a heal. // This object errored, we should attempt a heal just in case.
if errs[i] != nil { if errs[i] != nil && !isErrVersionNotFound(errs[i]) && !isErrObjectNotFound(errs[i]) {
// all other direct versionId references we should
// ensure no dangling file is left over.
er.addPartial(bucket, dobj.ObjectName, dobj.VersionID, -1)
continue continue
} }
@ -1648,6 +1651,18 @@ func (er erasureObjects) DeleteObject(ctx context.Context, bucket, object string
} }
fvID := mustGetUUID() fvID := mustGetUUID()
defer func() {
// attempt a heal before returning if there are offline disks
// for both del marker and permanent delete situations.
for _, disk := range storageDisks {
if disk != nil && disk.IsOnline() {
continue
}
er.addPartial(bucket, object, opts.VersionID, -1)
break
}
}()
if markDelete && (opts.Versioned || opts.VersionSuspended) { if markDelete && (opts.Versioned || opts.VersionSuspended) {
if !deleteMarker { if !deleteMarker {
// versioning suspended means we add `null` version as // versioning suspended means we add `null` version as
@ -1695,14 +1710,6 @@ func (er erasureObjects) DeleteObject(ctx context.Context, bucket, object string
return objInfo, toObjectErr(err, bucket, object) return objInfo, toObjectErr(err, bucket, object)
} }
for _, disk := range storageDisks {
if disk != nil && disk.IsOnline() {
continue
}
er.addPartial(bucket, object, opts.VersionID, -1)
break
}
return dfi.ToObjectInfo(bucket, object, opts.Versioned || opts.VersionSuspended), nil return dfi.ToObjectInfo(bucket, object, opts.Versioned || opts.VersionSuspended), nil
} }