MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-25 22:55:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Validate tier manager is initialized in tier Empty() check (#14646)

Browse Source 
Co-authored-by: Poorna Krishnamoorthy <poorna@minio.io>
This commit is contained in:
Poorna 2022-03-29 10:10:06 -07:00 committed by GitHub
parent e955aa7f2a
commit 9e25475475
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/metrics-v2.go
View File

@ -1651,13 +1651,13 @@ func getClusterTierMetrics() *MetricsGroup {
cacheInterval: 10 * time.Second, cacheInterval: 10 * time.Second,
} }
mg.RegisterRead(func(ctx context.Context) (metrics []Metric) { mg.RegisterRead(func(ctx context.Context) (metrics []Metric) {
if globalTierConfigMgr.Empty() {
return
}
objLayer := newObjectLayerFn() objLayer := newObjectLayerFn()
if objLayer == nil || globalIsGateway { if objLayer == nil || globalIsGateway {
return return
} }
if globalTierConfigMgr.Empty() {
return
}
dui, err := loadDataUsageFromBackend(GlobalContext, objLayer) dui, err := loadDataUsageFromBackend(GlobalContext, objLayer)
if err != nil { if err != nil {

3
cmd/tier.go
View File

@ -148,6 +148,9 @@ func (config *TierConfigMgr) Verify(ctx context.Context, tier string) error {
// Empty returns if tier targets are empty // Empty returns if tier targets are empty
func (config *TierConfigMgr) Empty() bool { func (config *TierConfigMgr) Empty() bool {
if config == nil {
return true
}
return len(config.ListTiers()) == 0 return len(config.ListTiers()) == 0
} }