MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 13:39:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

After healing re-load disks with the new format (#5718)

Browse Source 
This PR also fixes correct calculation of drive states
before and after healing of objects.

Fixes #5700
Fixes #5708
This commit is contained in:
Harshavardhana
2018-03-27 18:11:39 -07:00
committed by Nitish Tiwari
parent 76d1e8bbcd
commit 6e9c853312
3 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/xl-v1-healing.go
View File

@@ -338,20 +338,24 @@ func healObject(storageDisks []StorageAPI, bucket string, object string,
outDatedDisks[i] = storageDisks[i]
disksToHealCount++
}
var drive string
if v == nil {
if errs[i] != errDiskNotFound {
drive = outDatedDisks[i].String()
}
result.Before.Drives = append(result.Before.Drives, madmin.HealDriveInfo{
UUID: "",
Endpoint: "",
Endpoint: drive,
State: driveState,
})
result.After.Drives = append(result.After.Drives, madmin.HealDriveInfo{
UUID: "",
Endpoint: "",
Endpoint: drive,
State: driveState,
})
continue
}
drive := v.String()
drive = v.String()
result.Before.Drives = append(result.Before.Drives, madmin.HealDriveInfo{
UUID: "",
Endpoint: drive,
@@ -492,7 +496,7 @@ func healObject(storageDisks []StorageAPI, bucket string, object string,
}
// Rename from tmp location to the actual location.
for diskIndex, disk := range outDatedDisks {
for _, disk := range outDatedDisks {
if disk == nil {
continue
}
@@ -504,12 +508,9 @@ func healObject(storageDisks []StorageAPI, bucket string, object string,
return result, toObjectErr(errors.Trace(aErr), bucket, object)
}
realDiskIdx := unshuffleIndex(diskIndex, latestMeta.Erasure.Distribution)
if outDatedDisks[realDiskIdx] != nil {
for i, v := range result.After.Drives {
if v.Endpoint == outDatedDisks[realDiskIdx].String() {
result.After.Drives[i].State = madmin.DriveStateOk
}
for i, v := range result.Before.Drives {
if v.Endpoint == disk.String() {
result.After.Drives[i].State = madmin.DriveStateOk
}
}
}