Skip to content

Commit 711bb33

Browse files
k0machifruch
authored andcommitted
scylla-3.x: Increase networking-io-control-blocks for SessionStressTest
This makes the test execute properly on scylla, as before the test would crash with an assertion error (scylladb/scylladb#16252). Fixes scylladb/java-driver#250
1 parent 8af3017 commit 711bb33

File tree

1 file changed

+5
-5
lines changed
  • versions/scylla/3.11.2.4

1 file changed

+5
-5
lines changed

versions/scylla/3.11.2.4/patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ index 4c9ba61fc..3d0f4fa94 100644
2222
if (isDse()) {
2323
GLOBAL_DSE_VERSION_NUMBER = VersionNumber.parse(inputCassandraVersion);
2424
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java b/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
25-
index f50dac1fb..8827950a0 100644
25+
index 74befba29..e5867e506 100644
2626
--- a/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
2727
+++ b/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
2828
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
@@ -175,7 +175,7 @@ index f44e64dca..aed5e394c 100644
175175
Uninterruptibles.getUninterruptibly(request.requestInitialized, 10, TimeUnit.SECONDS);
176176
request.simulateSuccessResponse();
177177
diff --git a/driver-core/src/test/java/com/datastax/driver/core/NettyOptionsTest.java b/driver-core/src/test/java/com/datastax/driver/core/NettyOptionsTest.java
178-
index 5c7fc1fc4..cd47f02be 100644
178+
index fbdf187a7..dd1c34592 100644
179179
--- a/driver-core/src/test/java/com/datastax/driver/core/NettyOptionsTest.java
180180
+++ b/driver-core/src/test/java/com/datastax/driver/core/NettyOptionsTest.java
181181
@@ -45,7 +45,9 @@ import org.mockito.stubbing.Answer;
@@ -190,7 +190,7 @@ index 5c7fc1fc4..cd47f02be 100644
190190

191191
@Test(groups = "short")
192192
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java b/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java
193-
index 96ccc4412..80f64109a 100644
193+
index b3d6be0f3..30fafa527 100644
194194
--- a/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java
195195
+++ b/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java
196196
@@ -24,6 +24,7 @@ package com.datastax.driver.core;
@@ -238,7 +238,7 @@ index aa0f57379..6eaa74e31 100644
238238

239239
SocketChannelMonitor channelMonitor;
240240
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
241-
index 25fde7d5d..d7f664c33 100644
241+
index ea75f8454..ea70e9081 100644
242242
--- a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
243243
+++ b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
244244
@@ -38,7 +38,9 @@ import org.slf4j.LoggerFactory;
@@ -248,7 +248,7 @@ index 25fde7d5d..d7f664c33 100644
248248
-@CCMConfig(dirtiesContext = true)
249249
+@CCMConfig(
250250
+ dirtiesContext = true,
251-
+ jvmArgs = {"--smp", "1"})
251+
+ jvmArgs = {"--smp", "1", "--max-networking-io-control-blocks", "15000"})
252252
public class SessionStressTest extends CCMTestsSupport {
253253

254254
private static final Logger logger = LoggerFactory.getLogger(SessionStressTest.class);

0 commit comments

Comments
 (0)