kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

vault: fix bug in logging logic around renewals (#25040)

Browse Source 
In #24409 we fixed a bug where some of the error messages we get from Vault
weren't being caught correctly. This fix itself contains a bug where we changed
the logic that logged the non-fatal errors so that it logs when there is no
renewal error.

Ref: https://github.com/hashicorp/nomad/pull/24409
Fixes: https://github.com/hashicorp/nomad/issues/24933
This commit is contained in:
Tim Gross
2025-02-07 08:45:33 -05:00
committed by GitHub
parent cf0a046364
commit b5faeff233
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/25040.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
vault: Fixed a bug where successful renewal was logged as an error
```

8
client/vaultclient/vaultclient.go
View File

@@ -451,11 +451,11 @@ func (c *vaultClient) renew(req *vaultClientRenewalRequest) error {
strings.Contains(errMsg, "permission denied") || strings.Contains(errMsg, "permission denied") ||
strings.Contains(errMsg, "token not found") { strings.Contains(errMsg, "token not found") {
fatal = true fatal = true
} else {
c.logger.Debug("renewal error details", "req.increment", req.increment, "lease_duration", leaseDuration, "renewal_duration", renewalDuration)
c.logger.Error("error during renewal of lease or token failed due to a non-fatal error; retrying",
"error", renewalErr, "period", next)
} }
} else {
c.logger.Debug("renewal error details", "req.increment", req.increment, "lease_duration", leaseDuration, "renewal_duration", renewalDuration)
c.logger.Error("error during renewal of lease or token failed due to a non-fatal error; retrying",
"error", renewalErr, "period", next)
} }
if c.isTracked(req.id) { if c.isTracked(req.id) {