fix: carry the ShardAwarenessTest trace retry into the patched tags - #187
Merged
dkropachev merged 1 commit intoAug 13, 2026
Merged
Conversation
3.11.4.0 and 3.11.5.15 patch the test's dead assertThat(anyLocal) into a real assertTrue, which then fails whenever a query trace comes back incomplete. Regenerate both hunks so the patched result matches the scylla-3.x fix. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
dkropachev
approved these changes
Aug 13, 2026
This was referenced Aug 21, 2026
nikagra
added a commit
to nikagra/scylla-java-driver-matrix
that referenced
this pull request
Aug 26, 2026
Nothing caught a stale patch until the ~3.5h nightly Jenkins matrix failed: tests/test_apache_patches.py only greps apache patches for a UDF flag string and never checks that a patch applies, and no check ran when a patch, or the selector that decides which tags a patch has to satisfy, was edited. run.py already has the primitive -- --patch-only checks out a tag, applies patches and stops. Call extract_n_latest_repo_tags directly rather than reimplementing the selection, so this check cannot disagree with the tags Jenkins picks, and surface the resolved directory per tag in the job summary so a fallback is visible before it breaks. That summary is what would have shown scylladb#187 it was patching a tag nothing selects. The trigger is pull_request only. Newly published tags are a different problem with different owners -- upstream releases are watched separately, and Scylla driver releases are gated in scylladb/java-driver's release workflow -- so there is deliberately no schedule here. Deps are installed unpinned rather than from scripts/requirements.txt: those pins target the production container image and PyYAML==6.0 no longer builds on current Python, which would make this check fail for reasons unrelated to patches. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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.
Companion to scylladb/java-driver#1000, which fixes
ShardAwarenessTestonscylla-3.x.versions/scylla/3.11.4.0/patchand3.11.5.15/patchrewrite the test's deadassertThat(anyLocal);(an AssertJ boolean assert with no terminal method — it asserts nothing) into a realassertTrue. That assertion then fails whenever a query trace comes back incomplete, so those tags keep flaking regardless of the driver-side fix.Both hunks regenerated so the patched result is byte-identical to the fixed
scylla-3.xfile.Regenerated mechanically, not by hand: applied each tag's existing patch to a pristine checkout of that tag, copied the fixed file over, re-diffed. Both then pass
git apply --checkandpatch -p1against a pristine tag, produce a file identical to the driver fix, and compile at their tag.Tags > 3.11.5.15 need nothing — they carry the strict assertion upstream and get it from the driver fix.
🤖 Generated with Claude Code