scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 19:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update handleRollback to run both PeriodicFunc and handleWALRollback (#6717)

Browse Source
This commit is contained in:
Clint
2019-05-10 14:11:42 -05:00
committed by GitHub
parent 90ff541065
commit 43ecb08dfd
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/framework/backend.go
View File

@@ -418,16 +418,22 @@ func (b *Backend) handleRevokeRenew(ctx context.Context, req *logical.Request) (
} }
} }
// handleRollback invokes the PeriodicFunc set on the backend. It also does a WAL rollback operation. // handleRollback invokes the PeriodicFunc set on the backend. It also does a
// WAL rollback operation.
func (b *Backend) handleRollback(ctx context.Context, req *logical.Request) (*logical.Response, error) { func (b *Backend) handleRollback(ctx context.Context, req *logical.Request) (*logical.Response, error) {
// Response is not expected from the periodic operation. // Response is not expected from the periodic operation.
var merr error
if b.PeriodicFunc != nil { if b.PeriodicFunc != nil {
if err := b.PeriodicFunc(ctx, req); err != nil { if err := b.PeriodicFunc(ctx, req); err != nil {
return nil, err merr = multierror.Append(merr, err)
} }
} }
return b.handleWALRollback(ctx, req) resp, err := b.handleWALRollback(ctx, req)
if err != nil {
merr = multierror.Append(merr, err)
}
return resp, merr
} }
func (b *Backend) handleAuthRenew(ctx context.Context, req *logical.Request) (*logical.Response, error) { func (b *Backend) handleAuthRenew(ctx context.Context, req *logical.Request) (*logical.Response, error) {