scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 18:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove "expiration manager is nil on tokenstore" error log for dr secondary (#22137)

Browse Source 
* add check for dr secondary case

* add changelog
This commit is contained in:
akshya96
2023-07-31 14:06:28 -07:00
committed by GitHub
parent 7e6bb1fb7c
commit f3a4c01ba9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/22137.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
core: Remove "expiration manager is nil on tokenstore" error log for unauth requests on DR secondary as they do not have expiration manager.
```

8
vault/token_store.go
View File

@@ -1692,8 +1692,14 @@ func (ts *TokenStore) lookupInternal(ctx context.Context, id string, salted, tai
// If we are still restoring the expiration manager, we want to ensure the // If we are still restoring the expiration manager, we want to ensure the
// token is not expired // token is not expired
if ts.expiration == nil { if ts.expiration == nil {
return nil, errors.New("expiration manager is nil on tokenstore") switch ts.core.IsDRSecondary() {
case true: // Bail if on DR secondary as expiration manager is nil
return nil, nil
default:
return nil, errors.New("expiration manager is nil on tokenstore")
}
} }
le, err := ts.expiration.FetchLeaseTimesByToken(ctx, entry) le, err := ts.expiration.FetchLeaseTimesByToken(ctx, entry)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to fetch lease times: %w", err) return nil, fmt.Errorf("failed to fetch lease times: %w", err)