Repository navigation
fix(master): let maintenance executors opt out of WAL merge claims - #435
Merged
Merged
Conversation
beinan
marked this pull request as ready for review
October 21, 2026 12:57
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.
A maintenance master with
MERGE_WAL_INTERVAL_SECS=0still consumes queued MergeWal tasks. SettingMERGE_WAL_CONCURRENCY=0does not disable them either: it folds them into the general pool. In production, an older maintenance executor repeatedly claimed merge tasks and failed at the first unavailable worker, while retaining its compact/index role.Add
MASTER_CLAIM_WAL_MERGES=false(--claim-wal-merges=false) to opt a master out of scheduler MergeWal claims. The default remains true. It covers shared/general, dedicated RPC and resident merge pollers; Compact, IndexId and Repair continue using their existing queues. Merge tasks remain available to other executors. This does not cancel accepted tasks, change enqueue sweeps or ownership, or provide a drain mechanism for an already-running old binary.Validation: formatting and diff checks pass. The real isolated-etcd regression passed in all three configurations (shared, dedicated and resident): compact/index complete while MergeWal remains durably queued and unclaimed, then another executor claims it. Five additional regressions passed: CLI/default parsing, default merge admission, compaction progress with a saturated merge pool, reserved resident progress with a saturated legacy pool, and drain preserving accepted work while leaving queued tasks for peers. Clippy CI and all three wheel builds passed; remaining test/coverage CI is running. No production configuration changes are part of this PR.