MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 05:34:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

add unformatted disk as part of the error list (#10128)

Browse Source 
these errors should be ignored for quorum
error calculation to ensure that we don't
prematurely return unformatted disk error
as part of API calls
This commit is contained in:
Harshavardhana
2020-07-24 13:16:11 -07:00
committed by GitHub
parent 57ff9abca2
commit 35212b673e
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/object-api-common.go
View File

@@ -100,7 +100,9 @@ func cleanupDir(ctx context.Context, storage StorageAPI, volume, dirPath string)
if !HasSuffix(entryPath, SlashSeparator) {
// Delete the file entry.
err := storage.DeleteFile(volume, entryPath)
logger.LogIf(ctx, err)
if err != errDiskNotFound && err != errUnformattedDisk {
logger.LogIf(ctx, err)
}
return err
}
@@ -110,14 +112,18 @@ func cleanupDir(ctx context.Context, storage StorageAPI, volume, dirPath string)
if err == errFileNotFound {
return nil
} else if err != nil { // For any other errors fail.
logger.LogIf(ctx, err)
if err != errDiskNotFound && err != errUnformattedDisk {
logger.LogIf(ctx, err)
}
return err
} // else on success..
// Entry path is empty, just delete it.
if len(entries) == 0 {
err = storage.DeleteFile(volume, entryPath)
logger.LogIf(ctx, err)
if err != errDiskNotFound && err != errUnformattedDisk {
logger.LogIf(ctx, err)
}
return err
}