Merge branch 'release/1.10.x' into backport/update-release-channel/fa…

…ctually-artistic-coral
hashicorp · Aug 31, 2022 · b5460c4 · b5460c4
2 parents 7fb9633 + 94af518
commit b5460c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changelog/16956.txt b/changelog/16956.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: Prevent two or more DR failovers from invalidating SSCT tokens generated on the previous primaries.
+```
diff --git a/vault/token_store_util_common.go b/vault/token_store_util_common.go
@@ -38,6 +38,9 @@ func (ts *TokenStore) loadSSCTokensGenerationCounter(ctx context.Context) error
 }
 
 func (ts *TokenStore) UpdateSSCTokensGenerationCounter(ctx context.Context) error {
+	if err := ts.loadSSCTokensGenerationCounter(ctx); err != nil {
+		return err
+	}
 	ts.sscTokensGenerationCounter.Counter += 1
 	if ts.sscTokensGenerationCounter.Counter <= 0 {
 		// Don't store the 0 value