From 160797433498c5029329ef66ee6d3e9191626bc7 Mon Sep 17 00:00:00 2001
From: jacek-lewandowski <jacek.lewandowski@datastax.com>
Date: Fri, 12 Mar 2021 10:12:08 +0100
Subject: [PATCH 1/2] CASSANDRA-16514: Increase connect and read timeouts in
 CQLTester

---
 test/unit/org/apache/cassandra/cql3/CQLTester.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 96cd10588ce1..2a3d2d861e39 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -455,11 +455,16 @@ private static void initializeNetwork(Consumer<Server.Builder> decorator)
             if (clusters.containsKey(version))
                 continue;
 
+            SocketOptions socketOptions = new SocketOptions()
+                                          .setConnectTimeoutMillis(15000) // default is 5000
+                                          .setReadTimeoutMillis(30000); // default is 12000
+
             Cluster.Builder builder = Cluster.builder()
                                              .withoutJMXReporting()
                                              .addContactPoints(nativeAddr)
                                              .withClusterName("Test Cluster")
-                                             .withPort(nativePort);
+                                             .withPort(nativePort)
+                                             .withSocketOptions(socketOptions);
 
             if (version.isBeta())
                 builder = builder.allowBetaProtocolVersion();

From 7a1db6efdaaf55e5080313e1108872c0af3e1e9a Mon Sep 17 00:00:00 2001
From: jacek-lewandowski <jacek.lewandowski@datastax.com>
Date: Fri, 12 Mar 2021 22:21:48 +0100
Subject: [PATCH 2/2] CASSANDRA-16514: Make timeouts configurable

---
 build.xml                                          | 4 ++++
 test/unit/org/apache/cassandra/cql3/CQLTester.java | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index ecb1ad831579..5c683fecf0e6 100644
--- a/build.xml
+++ b/build.xml
@@ -65,6 +65,8 @@
     <property name="test.microbench.src" value="${test.dir}/microbench"/>
     <property name="test.distributed.src" value="${test.dir}/distributed"/>
     <property name="test.compression_algo" value="LZ4"/>
+    <property name="test.driver.connection_timeout_ms" value="5000"/>
+    <property name="test.driver.read_timeout_ms" value="12000"/>
     <property name="test.distributed.listfile" value="ant-jvm-dtest-list"/>
     <property name="test.distributed.upgrade.listfile" value="ant-jvm-dtest-upgrade-list"/>
     <property name="test.distributed.upgrade.package" value="org.apache.cassandra.distributed.upgrade"/>
@@ -1496,6 +1498,8 @@
              more aggressively rather than waiting. See CASSANDRA-14922 for more details.
         -->
         <jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" />
+        <jvmarg value="-Dcassandra.test.driver.connection_timeout_ms=${test.driver.connection_timeout_ms}"/>
+        <jvmarg value="-Dcassandra.test.driver.read_timeout_ms=${test.driver.read_timeout_ms}"/>
         <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
         <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
         <jvmarg value="-Dcassandra.test.offsetseed=@{poffset}"/>
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 2a3d2d861e39..14f7a41e25fe 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -88,6 +88,8 @@
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.JMXServerUtils;
 
+import static com.datastax.driver.core.SocketOptions.DEFAULT_CONNECT_TIMEOUT_MILLIS;
+import static com.datastax.driver.core.SocketOptions.DEFAULT_READ_TIMEOUT_MILLIS;
 import static junit.framework.Assert.assertNotNull;
 
 /**
@@ -456,8 +458,10 @@ private static void initializeNetwork(Consumer<Server.Builder> decorator)
                 continue;
 
             SocketOptions socketOptions = new SocketOptions()
-                                          .setConnectTimeoutMillis(15000) // default is 5000
-                                          .setReadTimeoutMillis(30000); // default is 12000
+                                          .setConnectTimeoutMillis(Integer.getInteger("cassandra.test.driver.connection_timeout_ms", DEFAULT_CONNECT_TIMEOUT_MILLIS)) // default is 5000
+                                          .setReadTimeoutMillis(Integer.getInteger("cassandra.test.driver.read_timeout_ms", DEFAULT_READ_TIMEOUT_MILLIS)); // default is 12000
+
+            logger.info("Timeouts: {} / {}", socketOptions.getConnectTimeoutMillis(), socketOptions.getReadTimeoutMillis());
 
             Cluster.Builder builder = Cluster.builder()
                                              .withoutJMXReporting()