fix: retry recovery window status conflicts - #1110
Closed
andrewmaspero wants to merge 1 commit into
Closed
andrewmaspero wants to merge 1 commit into
andrewmaspero wants to merge 1 commit into
Conversation
This file contains hidden or 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
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.
Problem
Retention and backup completion can update the same
ObjectStorestatus concurrently.updateRecoveryWindowcurrently writes an object read before the status update, so an optimistic-lock conflict aborts retention even though retrying against the latest resource version is safe.Change
Retry recovery-window status updates on conflict. Each attempt fetches the latest
ObjectStore, changes only the selected server's recovery-window fields, and preserves status fields written concurrently.The unit test injects one status conflict and a concurrent
LastFailedBackupTimeupdate, then verifies the retry succeeds without losing that field.Validation
CGO_ENABLED=0 go test ./internal/cnpgi/instanceCGO_ENABLED=0 go test ./...; the e2e suite could not start its deployment in the local environment and timed out before running any specs.