diff --git a/CHANGES.txt b/CHANGES.txt index eef797439d..457814ff22 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.0-beta2 + * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182) * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) diff --git a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java index 8be1c967c2..0040003941 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@ -89,13 +89,17 @@ public class JavaDriverClient public void connect(ProtocolOptions.Compression compression) throws Exception { - PoolingOptions poolingOpts = new PoolingOptions(); - poolingOpts.setCoreConnectionsPerHost(HostDistance.LOCAL, 8); + + PoolingOptions poolingOpts = new PoolingOptions() + .setConnectionsPerHost(HostDistance.LOCAL, 8, 8) + .setMaxRequestsPerConnection(HostDistance.LOCAL, 128) + .setNewConnectionThreshold(HostDistance.LOCAL, 100); + Cluster.Builder clusterBuilder = Cluster.builder() .addContactPoint(host) .withPort(port) .withPoolingOptions(poolingOpts) - .withProtocolVersion(ProtocolVersion.V2) + .withoutJMXReporting() .withoutMetrics(); // The driver uses metrics 3 with conflict with our version if (whitelist != null) clusterBuilder.withLoadBalancingPolicy(whitelist);