mirror of
https://github.com/minio/minio.git
synced 2025-04-01 10:13:42 -04:00
xl: Remove wrong wording for errCorruptedFormat (#18775)
Also add errCorruptedBackend to make it easier to differentiate between corrupted content or something else wrong in the backend drive
This commit is contained in:
parent
42cfdf246f
commit
a47fc75c26
@ -91,7 +91,7 @@ func diskErrToDriveState(err error) (state string) {
|
|||||||
switch {
|
switch {
|
||||||
case errors.Is(err, errDiskNotFound) || errors.Is(err, context.DeadlineExceeded):
|
case errors.Is(err, errDiskNotFound) || errors.Is(err, context.DeadlineExceeded):
|
||||||
state = madmin.DriveStateOffline
|
state = madmin.DriveStateOffline
|
||||||
case errors.Is(err, errCorruptedFormat):
|
case errors.Is(err, errCorruptedFormat) || errors.Is(err, errCorruptedBackend):
|
||||||
state = madmin.DriveStateCorrupt
|
state = madmin.DriveStateCorrupt
|
||||||
case errors.Is(err, errUnformattedDisk):
|
case errors.Is(err, errUnformattedDisk):
|
||||||
state = madmin.DriveStateUnformatted
|
state = madmin.DriveStateUnformatted
|
||||||
|
@ -30,8 +30,11 @@ var errMaxVersionsExceeded = StorageErr("maximum versions exceeded, please delet
|
|||||||
// errUnexpected - unexpected error, requires manual intervention.
|
// errUnexpected - unexpected error, requires manual intervention.
|
||||||
var errUnexpected = StorageErr("unexpected error, please report this issue at https://github.com/minio/minio/issues")
|
var errUnexpected = StorageErr("unexpected error, please report this issue at https://github.com/minio/minio/issues")
|
||||||
|
|
||||||
// errCorruptedFormat - corrupted backend format.
|
// errCorruptedFormat - corrupted format.
|
||||||
var errCorruptedFormat = StorageErr("corrupted backend format, specified drive mount has unexpected previous content")
|
var errCorruptedFormat = StorageErr("corrupted format")
|
||||||
|
|
||||||
|
// errCorruptedBackend - corrupted backend.
|
||||||
|
var errCorruptedBackend = StorageErr("corrupted backend")
|
||||||
|
|
||||||
// errUnformattedDisk - unformatted disk found.
|
// errUnformattedDisk - unformatted disk found.
|
||||||
var errUnformattedDisk = StorageErr("unformatted drive found")
|
var errUnformattedDisk = StorageErr("unformatted drive found")
|
||||||
|
@ -115,6 +115,8 @@ func toStorageErr(err error) error {
|
|||||||
return errVolumeAccessDenied
|
return errVolumeAccessDenied
|
||||||
case errCorruptedFormat.Error():
|
case errCorruptedFormat.Error():
|
||||||
return errCorruptedFormat
|
return errCorruptedFormat
|
||||||
|
case errCorruptedBackend.Error():
|
||||||
|
return errCorruptedBackend
|
||||||
case errUnformattedDisk.Error():
|
case errUnformattedDisk.Error():
|
||||||
return errUnformattedDisk
|
return errUnformattedDisk
|
||||||
case errInvalidAccessKeyID.Error():
|
case errInvalidAccessKeyID.Error():
|
||||||
|
@ -779,12 +779,12 @@ func (s *xlStorage) checkFormatJSON() (os.FileInfo, error) {
|
|||||||
return nil, errDiskAccessDenied
|
return nil, errDiskAccessDenied
|
||||||
}
|
}
|
||||||
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
||||||
return nil, errCorruptedFormat
|
return nil, errCorruptedBackend
|
||||||
} else if osIsPermission(err) {
|
} else if osIsPermission(err) {
|
||||||
return nil, errDiskAccessDenied
|
return nil, errDiskAccessDenied
|
||||||
}
|
}
|
||||||
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
||||||
return nil, errCorruptedFormat
|
return nil, errCorruptedBackend
|
||||||
}
|
}
|
||||||
return fi, nil
|
return fi, nil
|
||||||
}
|
}
|
||||||
@ -830,12 +830,12 @@ func (s *xlStorage) GetDiskID() (string, error) {
|
|||||||
return "", errDiskAccessDenied
|
return "", errDiskAccessDenied
|
||||||
}
|
}
|
||||||
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
||||||
return "", errCorruptedFormat
|
return "", errCorruptedBackend
|
||||||
} else if osIsPermission(err) {
|
} else if osIsPermission(err) {
|
||||||
return "", errDiskAccessDenied
|
return "", errDiskAccessDenied
|
||||||
}
|
}
|
||||||
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
logger.LogOnceIf(GlobalContext, err, "check-format-json") // log unexpected errors
|
||||||
return "", errCorruptedFormat
|
return "", errCorruptedBackend
|
||||||
}
|
}
|
||||||
|
|
||||||
format := &formatErasureV3{}
|
format := &formatErasureV3{}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user