diff --git a/cmd/data-scanner.go b/cmd/data-scanner.go index ce97f1fdd..fdf4b0e54 100644 --- a/cmd/data-scanner.go +++ b/cmd/data-scanner.go @@ -902,15 +902,11 @@ func (i *scannerItem) applyHealing(ctx context.Context, o ObjectLayer, oi Object Remove: healDeleteDangling, ScanMode: scanMode, } - res, err := o.HealObject(ctx, i.bucket, i.objectPath(), oi.VersionID, healOpts) - if err != nil { - if errors.Is(err, NotImplemented{}) || isErrObjectNotFound(err) || isErrVersionNotFound(err) { - err = nil - } - logger.LogIf(ctx, err) - return 0 + res, _ := o.HealObject(ctx, i.bucket, i.objectPath(), oi.VersionID, healOpts) + if res.ObjectSize > 0 { + return res.ObjectSize } - return res.ObjectSize + return 0 } func (i *scannerItem) applyLifecycle(ctx context.Context, o ObjectLayer, oi ObjectInfo) (applied bool, size int64) { diff --git a/cmd/erasure-healing-common.go b/cmd/erasure-healing-common.go index 06db36b19..7629047e4 100644 --- a/cmd/erasure-healing-common.go +++ b/cmd/erasure-healing-common.go @@ -347,13 +347,6 @@ func disksWithAllParts(ctx context.Context, onlineDisks []StorageAPI, partsMetad dataErrs[i] = errFileCorrupt continue } - - // Since erasure.Distribution is trustable we can fix the mismatching erasure.Index - if meta.Erasure.Distribution[i] != meta.Erasure.Index { - partsMetadata[i] = FileInfo{} - dataErrs[i] = errFileCorrupt - continue - } } } diff --git a/cmd/erasure-healing.go b/cmd/erasure-healing.go index bb5335a98..9b1a3554e 100644 --- a/cmd/erasure-healing.go +++ b/cmd/erasure-healing.go @@ -101,7 +101,6 @@ func (er erasureObjects) listAndHeal(bucket, prefix string, healEntry func(strin reportNotFound: false, agreed: func(entry metaCacheEntry) { if err := healEntry(bucket, entry); err != nil { - logger.LogIf(ctx, err) cancel() } }, @@ -114,7 +113,6 @@ func (er erasureObjects) listAndHeal(bucket, prefix string, healEntry func(strin } if err := healEntry(bucket, *entry); err != nil { - logger.LogIf(ctx, err) cancel() return } @@ -752,7 +750,6 @@ func (er *erasureObjects) healObject(ctx context.Context, bucket string, object // Attempt a rename now from healed data to final location. partsMetadata[i].SetHealing() if _, err = disk.RenameData(ctx, minioMetaTmpBucket, tmpID, partsMetadata[i], bucket, object); err != nil { - logger.LogIf(ctx, err) return result, err } @@ -905,7 +902,6 @@ func (er *erasureObjects) healObjectDir(ctx context.Context, bucket, object stri case errDiskNotFound: hr.After.Drives[i].State = madmin.DriveStateOffline default: - logger.LogIf(ctx, merr) hr.After.Drives[i].State = madmin.DriveStateCorrupt } }