Fixed intermitted test failure in TestShardController_SwapNodeWithLeaderElectionFailure#927
Merged
merlimat merged 2 commits intooxia-db:mainfrom Mar 4, 2026
Merged
Fixed intermitted test failure in TestShardController_SwapNodeWithLeaderElectionFailure#927merlimat merged 2 commits intooxia-db:mainfrom
merlimat merged 2 commits intooxia-db:mainfrom
Conversation
…derElectionFailure Signed-off-by: Matteo Merli <mmerli@apache.org>
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.
Fix flaky
TestShardController_SwapNodeWithLeaderElectionFailureAfter an election,
followerCaughtUpis set asynchronously in a background goroutine (ensureFollowerCaughtatshard_controller_election.go:513-515), butSteadyStateis set synchronously whenstart()returns. The test waited forSteadyStateand then calledChangeEnsemble, which could be rejected withErrNotReadyForChangeEnsembleif the background goroutine hadn't finished yet.The error was silently swallowed because
wg.Wait()was never called in the test, and the test hung for 10 seconds waiting forNewTermrequests that were never sent.Proof by elimination:
expectNewTermRequesttimes out — noNewTermRPC was sentonChangeEnsemblehas only two code paths:IsReadyForChangeEnsemble()returnsfalse→ returnErrNotReadyForChangeEnsemble(noNewTermsent)onElectLeader→NewTermis sentNewTermwas sent, path 1 was takenIsReadyForChangeEnsemble()returnse.followerCaughtUp.Load(), which isfalseuntil the background goroutine completesFix:
ChangeEnsemblein a loop until it's accepted (not rejected withErrNotReadyForChangeEnsemble). Applied to bothTestShardController_SwapNodeWithLeaderElectionFailureandTestShardController_LeaderElectionShouldNotFailIfRemoveFails.returnafterassert.Fail()in all 6expect*Requestfunctions to prevent nil pointer panics when the underlying timeout fires.