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

ignore remote disks with diskID empty as offline (#14168)

Browse Source 
concurrent loading of erasure sets can now expose a
situation in a distributed setup that might return
diskID as empty, treat such disks as offline.
This commit is contained in:
Harshavardhana 2022-01-24 19:40:02 -08:00 committed by GitHub
parent ebc3627c73
commit b68f0cbde4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/erasure-sets.go
View File

@ -160,6 +160,9 @@ func connectEndpoint(endpoint Endpoint) (StorageAPI, *formatErasureV3, error) {
// - i'th position is the set index // - i'th position is the set index
// - j'th position is the disk index in the current set // - j'th position is the disk index in the current set
func findDiskIndexByDiskID(refFormat *formatErasureV3, diskID string) (int, int, error) { func findDiskIndexByDiskID(refFormat *formatErasureV3, diskID string) (int, int, error) {
if diskID == "" {
return -1, -1, errDiskNotFound
}
if diskID == offlineDiskUUID { if diskID == offlineDiskUUID {
return -1, -1, fmt.Errorf("diskID: %s is offline", diskID) return -1, -1, fmt.Errorf("diskID: %s is offline", diskID)
} }
@ -439,6 +442,9 @@ func newErasureSets(ctx context.Context, endpoints PoolEndpoints, storageDisks [
} }
return return
} }
if diskID == "" {
return
}
m, n, err := findDiskIndexByDiskID(format, diskID) m, n, err := findDiskIndexByDiskID(format, diskID)
if err != nil { if err != nil {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
@ -1337,6 +1343,7 @@ func (s *erasureSets) HealFormat(ctx context.Context, dryRun bool) (res madmin.H
m, n, err := findDiskIndexByDiskID(refFormat, format.Erasure.This) m, n, err := findDiskIndexByDiskID(refFormat, format.Erasure.This)
if err != nil { if err != nil {
logger.LogIf(ctx, err)
continue continue
} }