fix: make lease functions less chatty #4100
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jipperinbham
approved these changes
Dec 3, 2024
dangra
reviewed
Dec 3, 2024
| @@ -536,13 +537,7 @@ func (lm *leasableMachine) ReleaseLease(ctx context.Context) error { | |||
| defer cancel() | |||
| } | |||
|
|
|||
| err := lm.flapsClient.ReleaseLease(ctx, lm.machine.ID, nonce) | |||
| contextTimedOutOrCanceled := errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) | |||
| if err != nil && (!contextWasAlreadyCanceled || !contextTimedOutOrCanceled) { | |||
There was a problem hiding this comment.
does it make any difference for contextWasAlreadyCanceled and !contextTimedOutOrCanceled ?
There was a problem hiding this comment.
Good catch! There are places where we call ReleaseLease and not logging any errors from that. Let me adjust them.
|
Adding releaseLease() function to log the error from |
dangra
approved these changes
Dec 5, 2024
Without this change, the console would be filled with "failed to release lease: lease not found" even if flyctl couldn't acquire one lease. ``` Updating existing machines in '...' with bluegreen strategy WARN failed to acquire lease: failed to get lease on VM e7843075ad2408: request returned non-2xx status: 408: WARN failed to release lease for machine 178122df9672d8: lease not found WARN failed to release lease: lease not found WARN failed to release lease for machine 7811772a5d7698: lease not found WARN failed to release lease: lease not found WARN failed to release lease for machine e286076f933508: lease not found WARN failed to release lease: lease not found ... ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Without this change, the console would be filled with "failed to release lease: lease not found" even if flyctl couldn't acquire one lease.
Change Summary
What and Why:
How:
Related to:
Documentation