fix: crash in globalTierJournal when TierConfig is not initialized (#17791)

This commit is contained in:
Harshavardhana
2023-08-03 14:16:15 -07:00
committed by GitHub
parent b762fbaf21
commit 239ccc9c40
4 changed files with 23 additions and 21 deletions

View File

@@ -362,6 +362,7 @@ func initAllSubsystems(ctx context.Context) {
// Create new ILM tier configuration subsystem
globalTierConfigMgr = NewTierConfigMgr()
globalTierJournal = NewTierJournal()
globalTransitionState = newTransitionState(GlobalContext)
globalSiteResyncMetrics = newSiteResyncMetrics(GlobalContext)
@@ -798,14 +799,10 @@ func serverMain(ctx *cli.Context) {
go func() {
// Initialize transition tier configuration manager
bootstrapTrace("globalTierConfigMgr.Init")
err := globalTierConfigMgr.Init(GlobalContext, newObject)
if err != nil {
if err := globalTierConfigMgr.Init(GlobalContext, newObject); err != nil {
logger.LogIf(GlobalContext, err)
} else {
globalTierJournal, err = initTierDeletionJournal(GlobalContext)
if err != nil {
logger.FatalIf(err, "Unable to initialize remote tier pending deletes journal")
}
logger.FatalIf(globalTierJournal.Init(GlobalContext), "Unable to initialize remote tier pending deletes journal")
}
}()