Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of secret/database: fix bug where too many wal deletes are deferred into release/1.9.x #16692

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion builtin/logical/database/rotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,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 {
Expand Down
3 changes: 3 additions & 0 deletions changelog/16686.txt
Original file line number Diff line number Diff line change
@@ -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.
```