Backport CASSANDRA-10392 - Custom Tracing Implementations #600
Conversation
This file contains 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
… to 0" tpetracca: Ignores changes to CHANGES.txt This reverts commit 2122ff8.
…t same consistency level client side" tpetracca: ignored changes to CHANGES.txt; had conflicts in StageManager.java for no-op task and testing method This reverts commit 7bd65a1.
tpetracca: ignored changes to CHANGES.txt Patch by Mick Semb Wever; reviewed by tjake for CASSANDRA-10392
…onsistency level client side This was originally: Merge branch 'cassandra-3.0' into cassandra-3.9 Ignored changes to CHANGES.txt Had conflicts in StageManager.java due to test method I wasn't sure if I could delete in earlier commit
Was originally the merge commit: Merge branch 'cassandra-3.0' into cassandra-3.X Ignored changes to CHANGES.txt Resolved conflicts in backport caused by CASSANDRA-11425 (which isn't on 2.2.18)
tpetracca
force-pushed
the
tp/CASSANDRA-10392-2
branch
from
a690e73 to
20ed3e7
Compare
tpetracca
changed the title
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.
This backports CASSANDRA-10392: apache/cassandra@bf25e66
Doing this in the process of rolling out integration of tracing (more for associating client oriented trace ids with service logs, rather than traces themselves) with the rest of our infra.
In practice 2.218 has CASSANDRA-11465 (7bd65a1) and CASSANDRA-12754 (2122ff8) which weren't yet on the 3.0 branch when CASSANDRA-10392 was introduced. So I tried to get cute and stack some reverts/cherry-picks to make it work a bit cleaner...
To make this make a little sense, when apache/cassandra takes hotfixes to a specific version, they then do chains of merge commits of the branch for that version through higher version branches up to trunk. Thus in practice the "merge commits" are just the original change + conflict resolution for each branch up to that point. So the git history typically looks something like (in this example I picked CASSANDRA-11465):
Vaguely what I did (in this order) was:
git revert 2122ff88feCHANGES.txtgit revert 7bd65a129cCHANGES.txtgit cherry-pick bf25e66CHANGES.txtgit cherry-pick -m1 8e775eaCHANGES.txtStageManager.javadue to a method visible for testing that for now I've kept to clean up (if possible) latergit cherry-pick -m1 94a01f6CHANGES.txt