Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rolling compact #365

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Fix rolling compact #365

merged 2 commits into from
Nov 11, 2024

Conversation

brandond
Copy link
Member

@brandond brandond commented Nov 11, 2024

Fixes #363

Undo the change from #360 and fix things the right way. That worked, but had the unfortunate side effect of moving the compact target forward within the inner loop. This whole thing can be done better by simplifying the error handling.

  • Revert "Record compact progress and metrics per iteration"
    This reverts commit aa4f2a7.
  • Simplify compact loop error handling
    Rather than restarting the outer loop on unhandled error, simmply break out of the inner loop on any error. We always want to update the compact and target rev, and do post-compact operations - so the only thing we really need to check the error for is logging and metrics.

@brandond brandond requested a review from a team as a code owner November 11, 2024 18:59
@brandond brandond force-pushed the fix-rolling-compact branch from 7b61759 to 3e60a01 Compare November 11, 2024 20:32
Rather than restarting the outer loop on unhandled error, simmply break out of the inner loop on any error. We always want to update the compact and target rev, and do post-compact operations - so the only thing we really need to check the error for is logging and metrics.

Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond force-pushed the fix-rolling-compact branch from 3e60a01 to 809103b Compare November 11, 2024 21:21
@brandond brandond merged commit 810f408 into k3s-io:master Nov 11, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compact reports deleting more rows than revisions
2 participants