MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-04 03:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: rootdisk detection by not using cached value when GetDiskInfo() errors out (#15249)

Browse Source 
GetDiskInfo() uses timedValue to cache the disk info for one second.

timedValue behavior was recently changed to return an old cached value
when calculating a new value returns an error.

When a mount point is empty, GetDiskInfo() will return errUnformattedDisk,
timedValue will return cached disk info with unexpected IsRootDisk value,
e.g. false if the mount point belongs to a root disk. Therefore, the mount
point will be considered a valid disk and will be formatted as well.

This commit will also add more defensive code when marking root disks:
always mark a disk offline for any GetDiskInfo() error except
errUnformattedDisk. The server will try anyway to reconnect to those
disks every 10 seconds.
This commit is contained in:
Anis Elleuch 2022-07-08 01:05:23 +01:00 committed by GitHub
parent 32b2f6117e
commit ed0cbfb31e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/erasure-sets.go
View File

@ -1165,8 +1165,12 @@ func markRootDisksAsDown(storageDisks []StorageAPI, errs []error) {
// Do nothing // Do nothing
return return
} }
infos, _ := getHealDiskInfos(storageDisks, errs) infos, ierrs := getHealDiskInfos(storageDisks, errs)
for i := range storageDisks { for i := range storageDisks {
if ierrs[i] != nil && ierrs[i] != errUnformattedDisk {
storageDisks[i] = nil
continue
}
if storageDisks[i] != nil && infos[i].RootDisk { if storageDisks[i] != nil && infos[i].RootDisk {
// We should not heal on root disk. i.e in a situation where the minio-administrator has unmounted a // We should not heal on root disk. i.e in a situation where the minio-administrator has unmounted a
// defective drive we should not heal a path on the root disk. // defective drive we should not heal a path on the root disk.

1
cmd/metrics-v2.go
View File

@ -232,6 +232,7 @@ type MetricsGroup struct {
// to populate new values upon cache invalidation. // to populate new values upon cache invalidation.
func (g *MetricsGroup) RegisterRead(read func(ctx context.Context) []Metric) { func (g *MetricsGroup) RegisterRead(read func(ctx context.Context) []Metric) {
g.metricsCache.Once.Do(func() { g.metricsCache.Once.Do(func() {
g.metricsCache.Relax = true
g.metricsCache.TTL = g.cacheInterval g.metricsCache.TTL = g.cacheInterval
g.metricsCache.Update = func() (interface{}, error) { g.metricsCache.Update = func() (interface{}, error) {
return read(GlobalContext), nil return read(GlobalContext), nil

21
cmd/utils.go
View File

@ -931,6 +931,10 @@ type timedValue struct {
// Should be set before calling Get(). // Should be set before calling Get().
TTL time.Duration TTL time.Duration
// When set to true, return the last cached value
// even if updating the value errors out
Relax bool
// Once can be used to initialize values for lazy initialization. // Once can be used to initialize values for lazy initialization.
// Should be set before calling Get(). // Should be set before calling Get().
Once sync.Once Once sync.Once
@ -951,13 +955,16 @@ func (t *timedValue) Get() (interface{}, error) {
v, err := t.Update() v, err := t.Update()
if err != nil { if err != nil {
// if update fails, return current if t.Relax {
// cached value along with error. // if update fails, return current
// // cached value along with error.
// Let the caller decide if they want //
// to use the returned value based // Let the caller decide if they want
// on error. // to use the returned value based
v = t.get(0) // on error.
v = t.get(0)
return v, err
}
return v, err return v, err
} }