backport of commit 948332e (#28681)

Co-authored-by: Victor Rodriguez <[email protected]>
hashicorp · Oct 10, 2024 · 12a66f0 · 12a66f0
1 parent 22bd97f
commit 12a66f0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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() {