Fix nil disks in getOnlineDisksWithHealing (#11419)

If a disk is skipped when nil it is still returned.
master
Klaus Post 4 years ago committed by GitHub
parent f2d49ec21a
commit a71e0483c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      cmd/erasure.go

@ -238,6 +238,7 @@ func (er erasureObjects) getOnlineDisksWithHealing() (newDisks []StorageAPI, hea
disk := disks[i-1] disk := disks[i-1]
if disk == nil { if disk == nil {
infos[i-1].Error = "nil disk"
return return
} }
@ -248,6 +249,7 @@ func (er erasureObjects) getOnlineDisksWithHealing() (newDisks []StorageAPI, hea
// //
// //
// - Future: skip busy disks // - Future: skip busy disks
infos[i-1].Error = err.Error()
return return
} }
@ -260,7 +262,7 @@ func (er erasureObjects) getOnlineDisksWithHealing() (newDisks []StorageAPI, hea
// Check if one of the drives in the set is being healed. // Check if one of the drives in the set is being healed.
// this information is used by crawler to skip healing // this information is used by crawler to skip healing
// this erasure set while it calculates the usage. // this erasure set while it calculates the usage.
if info.Healing { if info.Healing || info.Error != "" {
healing = true healing = true
continue continue
} }

Loading…
Cancel
Save