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

fix prometheus calculation of offline disks per instance (#9744)

Browse Source 
This was a regression introduced in 9baeda7 for prometheus
calculation of offline disks which should be local to
an instance.

fixes #9742
This commit is contained in:
Harshavardhana 2020-06-01 07:35:40 -07:00 committed by GitHub
parent 8befedef14
commit f90422a890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cmd/xl-v1.go
View File

@ -93,15 +93,29 @@ func (d byDiskTotal) Less(i, j int) bool {
} }
// getDisksInfo - fetch disks info across all other storage API. // getDisksInfo - fetch disks info across all other storage API.
func getDisksInfo(disks []StorageAPI) (disksInfo []DiskInfo, errs []error, onlineDisks, offlineDisks madmin.BackendDisks) { func getDisksInfo(disks []StorageAPI, local bool) (disksInfo []DiskInfo, errs []error, onlineDisks, offlineDisks madmin.BackendDisks) {
disksInfo = make([]DiskInfo, len(disks)) disksInfo = make([]DiskInfo, len(disks))
errs = make([]error, len(disks)) onlineDisks = make(madmin.BackendDisks)
offlineDisks = make(madmin.BackendDisks)
for _, disk := range disks {
if disk == OfflineDisk {
continue
}
peerAddr := disk.Hostname()
if _, ok := offlineDisks[peerAddr]; !ok {
offlineDisks[peerAddr] = 0
}
if _, ok := onlineDisks[peerAddr]; !ok {
onlineDisks[peerAddr] = 0
}
}
g := errgroup.WithNErrs(len(disks)) g := errgroup.WithNErrs(len(disks))
for index := range disks { for index := range disks {
index := index index := index
g.Go(func() error { g.Go(func() error {
if disks[index] == nil { if disks[index] == OfflineDisk {
// Storage disk is empty, perhaps ignored disk or not available. // Storage disk is empty, perhaps ignored disk or not available.
return errDiskNotFound return errDiskNotFound
} }
@ -119,27 +133,17 @@ func getDisksInfo(disks []StorageAPI) (disksInfo []DiskInfo, errs []error, onlin
}, index) }, index)
} }
onlineDisks = make(madmin.BackendDisks)
offlineDisks = make(madmin.BackendDisks)
errs = g.Wait() errs = g.Wait()
// Wait for the routines. // Wait for the routines.
for i, diskInfoErr := range errs { for i, diskInfoErr := range errs {
if disks[i] == nil { if disks[i] == OfflineDisk {
continue continue
} }
peerAddr := disks[i].Hostname() if diskInfoErr != nil {
if _, ok := offlineDisks[peerAddr]; !ok { offlineDisks[disks[i].Hostname()]++
offlineDisks[peerAddr] = 0
}
if _, ok := onlineDisks[peerAddr]; !ok {
onlineDisks[peerAddr] = 0
}
if disks[i] == nil || diskInfoErr != nil {
offlineDisks[peerAddr]++
continue continue
} }
onlineDisks[peerAddr]++ onlineDisks[disks[i].Hostname()]++
} }
// Iterate over the passed endpoints arguments and check // Iterate over the passed endpoints arguments and check
@ -148,6 +152,11 @@ func getDisksInfo(disks []StorageAPI) (disksInfo []DiskInfo, errs []error, onlin
missingOfflineDisks := make(map[string]int) missingOfflineDisks := make(map[string]int)
for _, zone := range globalEndpoints { for _, zone := range globalEndpoints {
for _, endpoint := range zone.Endpoints { for _, endpoint := range zone.Endpoints {
// if local is set and endpoint is not local
// we are not interested in remote disks.
if local && !endpoint.IsLocal {
continue
}
if _, ok := offlineDisks[endpoint.Host]; !ok { if _, ok := offlineDisks[endpoint.Host]; !ok {
missingOfflineDisks[endpoint.Host]++ missingOfflineDisks[endpoint.Host]++
} }
@ -163,8 +172,8 @@ func getDisksInfo(disks []StorageAPI) (disksInfo []DiskInfo, errs []error, onlin
} }
// Get an aggregated storage info across all disks. // Get an aggregated storage info across all disks.
func getStorageInfo(disks []StorageAPI) (StorageInfo, []error) { func getStorageInfo(disks []StorageAPI, local bool) (StorageInfo, []error) {
disksInfo, errs, onlineDisks, offlineDisks := getDisksInfo(disks) disksInfo, errs, onlineDisks, offlineDisks := getDisksInfo(disks, local)
// Sort so that the first element is the smallest. // Sort so that the first element is the smallest.
sort.Sort(byDiskTotal(disksInfo)) sort.Sort(byDiskTotal(disksInfo))
@ -212,7 +221,7 @@ func (xl xlObjects) StorageInfo(ctx context.Context, local bool) (StorageInfo, [
} }
disks = localDisks disks = localDisks
} }
return getStorageInfo(disks) return getStorageInfo(disks, local)
} }
// GetMetrics - is not implemented and shouldn't be called. // GetMetrics - is not implemented and shouldn't be called.