fix: add version dirs for the new 3.11.5.18 and 4.19.2.1 tags - #188
Merged
dkropachev merged 1 commit intoAug 25, 2026
Merged
Conversation
Both tags were cut on 2026-08-17 ~18:22Z, minutes after scylladb/java-driver#1003 merged. Neither had a version directory, so Run.version_folder fell back to 3.11.5.16/ and 4.19.2.0/, whose patches no longer apply -- master #2101 failed with zero test failures, two of six runs dying in _apply_patch_files() before a single test ran. 2026.3 will select the same two tags and fail identically. 3.11.5.18 (derived from 3.11.5.16/): - drop the WarningsTest hunk: #1003 (d88197e11d) added the byte-identical @ScyllaSkip line upstream, so the hunk is now a reversed patch. - drop the LWTLoadBalancingIT hunks: 50b618a13a renamed the file to *Test.java and 301b879d2b already removed the trailing ctor values. - regenerate the CCMBridge.add() hunk. Upstream b45a7291fa took only the thrift half, restructuring the method into if (isScylla) branches; the deterministic jmxPort = 7000 + n * 100 is still needed, so it now lives inside that branch. - no ShardAwarenessTest hunk: .18 carries #1000 upstream. 4.19.2.1 (derived from 4.19.2.0/): - drop the SessionUtils hunk: upstream now applies the tablets workaround via shouldUseScyllaTabletsWorkaroundForTestKeyspaces(), gated on Scylla OSS >= 6.1.0 / Enterprise >= 2024.2.0, which is strictly better than the unconditional override the hunk performed. Both patches carry google-java-format's canonical output, so the fmt:format step run.py runs before building no longer rewrites them. Nothing is added for 3.11.5.17, whose ShardAwarenessTest failure in 2026.3 scylladb#5 needs no fix: extract_n_latest_repo_tags dedupes on the first three version components, so only the newest tag per line is ever selected and .17 will not be picked again. Verified: both patches pass `git apply --check` and `patch -p1` against pristine tags with no rejects; all four selected tags now resolve exactly with no fallback; `--patch-only` exits 0 for scylla and apache; 3.11.5.18 compiles (275 test sources, Java 8) and 4.19.2.1 fully installs (32 modules). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
nikagra
force-pushed
the
fix/version-dirs-3.11.5.18-4.19.2.1
branch
from
August 21, 2026 21:39
a2c5d80 to
607d1af
Compare
dkropachev
approved these changes
Aug 25, 2026
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.
3.11.5.18and4.19.2.1were tagged on 2026-08-17, ~25 minutes after scylladb/java-driver#1003 merged. Neither had a version directory, soRun.version_folderfell back to3.11.5.16/and4.19.2.0/— and those patches no longer apply.master #2101 failed with 0 test failures (5114 passed): two of six runs died in
_apply_patch_files()before executing a single test. 2026.3 selects the same two tags, so this fixes both pipelines.What changed
New
versions/scylla/3.11.5.18/andversions/scylla/4.19.2.1/, each derived from the directory it had been falling back to:WarningsTest.java@ScyllaSkipline upstreamLWTLoadBalancingIT.java*Test.javaupstream (50b618a13a); fix already applied (301b879d2b)CCMBridge.javab45a7291fatook only the thrift half — our deterministic JMX port is still neededSessionUtils.javaThe prevention work this investigation turned up — fixing the misleading fallback log, and a scheduled check so a new tag breaks a 20-second job instead of a 3.5-hour matrix run — is split out into its own PR, tracked by #189.
Nothing for 3.11.5.17
2026.3 #5's
ShardAwarenessTestfailure needs no fix..17genuinely lacks #1000's retry, butextract_n_latest_repo_tagsdedupes on the first three version components, so only the newest tag per line is ever selected —.17will not be picked again.Verification
Both patches apply cleanly (
git apply --checkandpatch -p1, no rejects); all four selected tags now resolve exactly with no fallback;--patch-onlyis green for scylla and apache;3.11.5.18compiles and4.19.2.1fully installs;pytest tests/30/30. Hiding the two new directories reproduces #2101's errors and exits 1.Expect a follow-up:
3.11.5.18has never executed a test in this matrix, and six driver-core classes newly enter Surefire's discovery.ignore.yamlis copied unchanged rather than pre-emptively suppressing failures nobody has observed yet.🤖 Generated with Claude Code