Increase the timeout on CQL queries. (#4447)

atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/async/client/creation/DefaultCqlClientFactory.java

@@ -32,6 +32,7 @@
 import com.datastax.driver.core.ProtocolVersion;
 import com.datastax.driver.core.QueryOptions;
 import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions;
+import com.datastax.driver.core.SocketOptions;
 import com.datastax.driver.core.ThreadingOptions;
 import com.datastax.driver.core.policies.DefaultRetryPolicy;
 import com.datastax.driver.core.policies.LatencyAwarePolicy;
@@ -94,6 +95,7 @@ public CqlClient visit(CassandraServersConfigs.CqlCapableConfig cqlCapableConfig
                 clusterBuilder = withPoolingOptions(clusterBuilder, config);
                 clusterBuilder = withQueryOptions(clusterBuilder, config);
                 clusterBuilder = withLoadBalancingPolicy(clusterBuilder, config, servers);
+                clusterBuilder = withSocketOptions(clusterBuilder, config);
 
                 return CqlClientImpl.create(
                         taggedMetricRegistry,
@@ -104,6 +106,11 @@ public CqlClient visit(CassandraServersConfigs.CqlCapableConfig cqlCapableConfig
         });
     }
 
+    private Cluster.Builder withSocketOptions(Cluster.Builder clusterBuilder, CassandraKeyValueServiceConfig config) {
+        return clusterBuilder.withSocketOptions(
+                new SocketOptions().setReadTimeoutMillis(config.socketQueryTimeoutMillis()));
+    }
+
     private static Cluster.Builder withSslOptions(Cluster.Builder builder, CassandraKeyValueServiceConfig config) {
         if (!config.usingSsl()) {
             return builder;

changelog/@unreleased/pr-4447.v2.yml

@@ -0,0 +1,6 @@
+type: improvement
+improvement:
+  description: Set the timeout on CQL queries from the default 12 seconds to the `socketQueryTimeoutMillis`
+    specified in `CasssandraKeyValueServiceConfig`.
+  links:
+  - https://github.com/palantir/atlasdb/pull/4447