Fix formatting disks in a test environment (#13043)

markRootDisksAsDown() relies on disk info even if the 
disk is unformatted. Therefore, we should always return 
DiskInfo data even when DiskInfo storage API returns 
errUnformattedDisk
This commit is contained in:
Anis Elleuch 2021-08-23 20:53:54 +01:00 committed by GitHub
parent 9e9bfd0255
commit 901d1314af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions

View File

@ -86,16 +86,14 @@ function __init__()
}
function perform_test() {
start_minio_3_node 120
start_minio_3_node 60
echo "Testing Distributed Erasure setup healing of drives"
echo "Remove the contents of the disks belonging to '${1}' erasure set"
set -x
rm -rf ${WORK_DIR}/${1}/*/
start_minio_3_node 200
start_minio_3_node 60
rv=$(check_online)
if [ "$rv" == "1" ]; then

View File

@ -298,10 +298,9 @@ func (client *storageRESTClient) DiskInfo(ctx context.Context) (info DiskInfo, e
client.diskInfoCache.Update = client.diskInfo
})
val, err := client.diskInfoCache.Get()
if err == nil {
info = val.(DiskInfo)
if val != nil {
return val.(DiskInfo), err
}
return info, err
}