Skip to content

Commit 71174e9

Browse files
committed
scylla 4.19.0.8/9: drop release: prefix in getCcmVersionString()
The getCcmVersionString() method in the scylla-java-driver source at tags 4.19.0.8 and 4.19.0.9 returns "release:" + versionString when the backend is Scylla. This causes CCM to attempt a remote download instead of using the locally-installed package, producing 105+ cluster creation failures per test run. Add a patch hunk to drop the prefix, following the same pattern used in versions/scylla/4.18.1.0/patch.
1 parent 889ba20 commit 71174e9

2 files changed

Lines changed: 24 additions & 2 deletions

File tree

versions/scylla/4.19.0.8/patch

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,18 @@ index e7b2b4e4a..a4b2ecea7 100644
529529
}
530530

531531
// Copied from Netty's PlatformDependent to avoid the dependency on Netty
532-
@@ -503,7 +506,18 @@ public class CcmBridge implements AutoCloseable {
532+
@@ -343,7 +346,9 @@
533+
if (shouldReplace) {
534+
versionString = versionString.replace(".0-", ".");
535+
}
536+
- return "release:" + versionString;
537+
+ // Dropping "release:" prefix so CCM uses the locally-installed Scylla package instead of
538+
+ // attempting to download from S3. See versions/scylla/4.18.1.0/patch for the same fix.
539+
+ return versionString;
540+
}
541+
// for 4.0 or 5.0 pre-releases, the CCM version string needs to be "4.0-alpha1", "4.0-alpha2" or
542+
// "5.0-beta1" Version.toString() always adds a patch value, even if it's not specified when
543+
@@ -503,7 +506,18 @@ public class CcmBridge implements AutoCloseable {
533544
}
534545

535546
public void addWithoutStart(int n, String dc) {

versions/scylla/4.19.0.9/patch

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,18 @@ index e7b2b4e4a0..8fbbed8d95 100644
207207
}
208208

209209
// Copied from Netty's PlatformDependent to avoid the dependency on Netty
210-
@@ -503,7 +509,18 @@ public class CcmBridge implements AutoCloseable {
210+
@@ -343,7 +346,9 @@
211+
if (shouldReplace) {
212+
versionString = versionString.replace(".0-", ".");
213+
}
214+
- return "release:" + versionString;
215+
+ // Dropping "release:" prefix so CCM uses the locally-installed Scylla package instead of
216+
+ // attempting to download from S3. See versions/scylla/4.18.1.0/patch for the same fix.
217+
+ return versionString;
218+
}
219+
// for 4.0 or 5.0 pre-releases, the CCM version string needs to be "4.0-alpha1", "4.0-alpha2" or
220+
// "5.0-beta1" Version.toString() always adds a patch value, even if it's not specified when
221+
@@ -503,7 +509,18 @@ public class CcmBridge implements AutoCloseable {
211222
}
212223

213224
public void addWithoutStart(int n, String dc) {

0 commit comments

Comments
 (0)