backport of commit 1ef5211 (#16694)

Co-authored-by: Jason O'Donnell <[email protected]>
hashicorp · Aug 11, 2022 · 835c959 · 835c959
1 parent 885e0a8
commit 835c959
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/builtin/logical/database/rotation.go b/builtin/logical/database/rotation.go
@@ -537,7 +537,7 @@ func (b *databaseBackend) initQueue(ctx context.Context, conf *logical.BackendCo
 			}
 
 			walID, err := framework.PutWAL(ctx, conf.StorageView, staticWALKey, &setCredentialsWAL{RoleName: "vault-readonlytest"})
-			if walID != "" {
+			if walID != "" && err == nil {
 				defer framework.DeleteWAL(ctx, conf.StorageView, walID)
 			}
 			switch {

diff --git a/changelog/16686.txt b/changelog/16686.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+secrets/database: Fix a bug where the secret engine would queue up a lot of WAL deletes during startup.
+```