MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-17 01:10:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: populate buckets on etcd after config has loaded (#8658)

Browse Source
This commit is contained in:
Harshavardhana 2019-12-17 13:50:07 -08:00 committed by GitHub
parent 5f2318567e
commit 9bb0869b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/gateway-main.go
View File

@ -229,15 +229,6 @@ func StartGateway(ctx *cli.Context, gw Gateway) {
globalObjectAPI = newObject globalObjectAPI = newObject
globalObjLayerMutex.Unlock() globalObjLayerMutex.Unlock()
// Populate existing buckets to the etcd backend
if globalDNSConfig != nil {
buckets, err := newObject.ListBuckets(context.Background())
if err != nil {
logger.Fatal(err, "Unable to list buckets")
}
initFederatorBackend(buckets, newObject)
}
// Migrate all backend configs to encrypted backend, also handles rotation as well. // Migrate all backend configs to encrypted backend, also handles rotation as well.
// For "nas" gateway we need to specially handle the backend migration as well. // For "nas" gateway we need to specially handle the backend migration as well.
// Internally code handles migrating etcd if enabled automatically. // Internally code handles migrating etcd if enabled automatically.
@ -286,6 +277,15 @@ func StartGateway(ctx *cli.Context, gw Gateway) {
globalObjLayerMutex.Unlock() globalObjLayerMutex.Unlock()
} }
// Populate existing buckets to the etcd backend
if globalDNSConfig != nil {
buckets, err := newObject.ListBuckets(context.Background())
if err != nil {
logger.Fatal(err, "Unable to list buckets")
}
initFederatorBackend(buckets, newObject)
}
// Verify if object layer supports // Verify if object layer supports
// - encryption // - encryption
// - compression // - compression

10
cmd/server-main.go
View File

@ -374,11 +374,6 @@ func serverMain(ctx *cli.Context) {
logger.Fatal(err, "Unable to list buckets") logger.Fatal(err, "Unable to list buckets")
} }
// Populate existing buckets to the etcd backend
if globalDNSConfig != nil {
initFederatorBackend(buckets, newObject)
}
logger.FatalIf(initSafeMode(buckets), "Unable to initialize server switching into safe-mode") logger.FatalIf(initSafeMode(buckets), "Unable to initialize server switching into safe-mode")
if globalCacheConfig.Enabled { if globalCacheConfig.Enabled {
@ -392,6 +387,11 @@ func serverMain(ctx *cli.Context) {
globalObjLayerMutex.Unlock() globalObjLayerMutex.Unlock()
} }
// Populate existing buckets to the etcd backend
if globalDNSConfig != nil {
initFederatorBackend(buckets, newObject)
}
initDataUsageStats() initDataUsageStats()
initDailyLifecycle() initDailyLifecycle()