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

heal-info: Return the endpoint of a disk with unknown state (#15854)

Browse Source
This commit is contained in:
Anis Elleuch 2022-10-14 00:41:44 +01:00 committed by GitHub
parent 44097faec1
commit db7a9b2c37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/erasure.go
View File

@ -107,7 +107,6 @@ func (d byDiskTotal) Less(i, j int) bool {
} }
func diskErrToDriveState(err error) (state string) { func diskErrToDriveState(err error) (state string) {
state = madmin.DriveStateUnknown
switch { switch {
case errors.Is(err, errDiskNotFound): case errors.Is(err, errDiskNotFound):
state = madmin.DriveStateOffline state = madmin.DriveStateOffline
@ -121,7 +120,10 @@ func diskErrToDriveState(err error) (state string) {
state = madmin.DriveStateFaulty state = madmin.DriveStateFaulty
case err == nil: case err == nil:
state = madmin.DriveStateOk state = madmin.DriveStateOk
default:
state = fmt.Sprintf("%s (cause: %s)", madmin.DriveStateUnknown, err)
} }
return return
} }
@ -184,18 +186,19 @@ func getDisksInfo(disks []StorageAPI, endpoints []Endpoint) (disksInfo []madmin.
for index := range disks { for index := range disks {
index := index index := index
g.Go(func() error { g.Go(func() error {
diskEndpoint := endpoints[index].String()
if disks[index] == OfflineDisk { if disks[index] == OfflineDisk {
logger.LogIf(GlobalContext, fmt.Errorf("%s: %s", errDiskNotFound, endpoints[index])) logger.LogIf(GlobalContext, fmt.Errorf("%s: %s", errDiskNotFound, endpoints[index]))
disksInfo[index] = madmin.Disk{ disksInfo[index] = madmin.Disk{
State: diskErrToDriveState(errDiskNotFound), State: diskErrToDriveState(errDiskNotFound),
Endpoint: endpoints[index].String(), Endpoint: diskEndpoint,
} }
// Storage disk is empty, perhaps ignored disk or not available. // Storage disk is empty, perhaps ignored disk or not available.
return errDiskNotFound return errDiskNotFound
} }
info, err := disks[index].DiskInfo(context.TODO()) info, err := disks[index].DiskInfo(context.TODO())
di := madmin.Disk{ di := madmin.Disk{
Endpoint: info.Endpoint, Endpoint: diskEndpoint,
DrivePath: info.MountPath, DrivePath: info.MountPath,
TotalSpace: info.Total, TotalSpace: info.Total,
UsedSpace: info.Used, UsedSpace: info.Used,