C21563 misc cep45 bugfixes - #5017
Open
bdeggleston wants to merge 7 commits into
Open
Conversation
The private ShortMutationId(int hostId, int hostLogId, int offset) ctor was being called with (hostLogId, hostId), transposing the two fields. Currently latent - no caller passes a MutationId - but the constructor is public. Cherry-picked from aci-cassandra 09b9b05fd0.
cleanup() now wipes the mutation tracking journal directory alongside the Accord journal, and MutationJournal.start() moves after cleanupAndLeaveDirs() so the journal is not started against directories that are about to be deleted. Cherry-picked from aci-cassandra 09b9b05fd0 and 6c206f15de.
NodetoolHelpCommandsOutputTest had 8 failures without these. Cherry-picked from aci-cassandra e4d1296037.
The test wrote consistent data before installing the offset broadcast filter, which let the write path mark the writes reconciled and the sync coordinator complete before the topology change was observed. Write inconsistent data after the filter is in place instead. Cherry-picked from aci-cassandra 274dc829ea. The @ignore(NO_TOPOLOGY_CHANGES) it added was removed again by 55af9fd957 once the underlying issue was fixed, so only the ignore reason constant is carried over here.
Drop MT_SYNC_RSP so the coordinator never receives sync responses, rather than pausing offset broadcasts, which no longer keeps the coordinator waiting. Cherry-picked from aci-cassandra eff3d6de2b.
A keyspace can be dropped locally while offset broadcasts referencing it are still in flight from peers. getOrCreateShards now returns null in that case instead of failing on missing keyspace metadata, and updateReplicatedOffsets ignores the broadcast. Cherry-picked from aci-cassandra 55af9fd957, with the null check expressed as an if/else rather than an early return, so the sync coordinator notification that follows the lock scope on this branch still runs.
IndexStreamingTest: include isWide in the parameterized test name. TrackedImportFailureTest: disable the background reconciler in importMissedActivation. Cherry-picked from aci-cassandra bde1f1daf7 and c3789023fa.
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
2 participants
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.
Thanks for sending a pull request! Here are some tips if you're new here:
Commit messages should follow the following format:
The Cassandra Jira