From 14cee9286eaf5c863d9911ba32b04f5d5ec90a0b Mon Sep 17 00:00:00 2001 From: Victor Rodriguez Date: Thu, 10 Oct 2024 20:58:58 +0000 Subject: [PATCH] backport of commit 948332ed3e7083179de5d06827672da41e8b64d6 --- vault/init.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vault/init.go b/vault/init.go index f7e1c8190799..efec8677fe2e 100644 --- a/vault/init.go +++ b/vault/init.go @@ -421,17 +421,17 @@ func (c *Core) Initialize(ctx context.Context, initParams *InitParams) (*InitRes } } + if err := c.seal.ClearInitializationFlag(ctx); err != nil { + c.logger.Error("Error clearing initialization flag", "error", err) + return nil, fmt.Errorf("error clearing initialization flag: %w", err) + } + // Prepare to re-seal if err := c.preSeal(); err != nil { c.logger.Error("pre-seal teardown failed", "error", err) return nil, err } - if err := c.seal.ClearInitializationFlag(ctx); err != nil { - c.logger.Error("Error clearing initialization flag", "error", err) - return nil, fmt.Errorf("error clearing initialization flag: %w", err) - } - if c.serviceRegistration != nil { if err := c.serviceRegistration.NotifyInitializedStateChange(true); err != nil { if c.logger.IsWarn() {