You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/08/27 22:03:19 UTC
[1/2] cassandra git commit: Choose better poolingOptions for protocol
v4 in cassandra-stress
Repository: cassandra
Updated Branches:
refs/heads/trunk 0174ad406 -> f744b6c05
Choose better poolingOptions for protocol v4 in cassandra-stress
Patch by tjake; reviewed by Alan Boudreault for CASSANDRA-10182
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16b9f8bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16b9f8bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16b9f8bb
Branch: refs/heads/trunk
Commit: 16b9f8bba440a8c027fb0b3e801406dca1aaaa8d
Parents: f00a3da
Author: T Jake Luciani <ja...@apache.org>
Authored: Tue Aug 25 15:02:04 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Aug 27 16:00:18 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/util/JavaDriverClient.java | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16b9f8bb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index eef7974..457814f 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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16b9f8bb/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
----------------------------------------------------------------------
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 8be1c96..0040003 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);
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f744b6c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f744b6c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f744b6c0
Branch: refs/heads/trunk
Commit: f744b6c05537b84b60f53917fafb32bc1d8b1b03
Parents: 0174ad4 16b9f8b
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Aug 27 16:03:08 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Aug 27 16:03:08 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/util/JavaDriverClient.java | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f744b6c0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7c985dc,457814f..f27e5e7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
+3.2
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
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)