[FLINK-39439] Fix savepoint history entry removed from status before dispose succeeds#1089
Merged
Merged
Conversation
gyfora
approved these changes
Apr 15, 2026
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.
What is the purpose of the change
In legacy mode,
cleanupSavepointHistoryLegacyremoved the savepoint entry from the deployment status before calling the Flink dispose API. If the job was down at that moment, the dispose call failed silently and the entry was already gone - leaving the savepoint files on storage permanently with no path to cleanup.Fix: invert the order - call dispose first, only remove the status entry on success. On failure the entry is retained and retried on the next reconcile cycle. For count-based eviction a break is used on failure since entries are oldest-first and skipping the oldest would still orphan it. For age-based eviction each entry is evaluated independently so cleanup continues on failure.
Tests added (SnapshotObserverLegacyTest):
testCountBasedDisposeRetainsEntryOnFailure- entry kept when dispose fails (count path)testAgeBasedDisposeRetainsEntryOnFailure- entry kept when dispose fails (age path)testDisposeRetryOnSubsequentReconcile- entry successfully cleaned up on the next reconcile after dispose recoversBrief change log
Fixed the issue and added tests.
Verifying this change
Existing + new automated tests.
Does this pull request potentially affect one of the following parts:
CustomResourceDescriptors: noDocumentation