Return-Path: 
 <commits-return-135827-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 647E0181C4
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Thu, 25 Jun 2015 18:34:52 +0000 (UTC)
Received: (qmail 93688 invoked by uid 500); 25 Jun 2015 18:34:52 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 93653 invoked by uid 500); 25 Jun 2015 18:34:52 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 93642 invoked by uid 99); 25 Jun 2015 18:34:52 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2015 18:34:52 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 22026E3691; Thu, 25 Jun 2015 18:34:52 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jake@apache.org
To: commits@cassandra.apache.org
Message-Id: <3908563d48c04cf2917e5e2af4479207@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: cassandra git commit: Optimize stress driver config for 2.2
Date: Thu, 25 Jun 2015 18:34:52 +0000 (UTC)

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 f4449bd45 -> 26bd5124e


Optimize stress driver config for 2.2

Patch by Andrew Tolbert; reviewed by tjake for CASSANDRA-9558


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26bd5124
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26bd5124
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26bd5124

Branch: refs/heads/cassandra-2.2
Commit: 26bd5124efbc08a657e703b3f9776d9fd6ba6c22
Parents: f4449bd
Author: Andrew Tolbert <andrew.tolbert@datastax.com>
Authored: Sat Jun 6 01:59:29 2015 -0500
Committer: T Jake Luciani <jake@apache.org>
Committed: Thu Jun 25 14:28:31 2015 -0400

----------------------------------------------------------------------
 build.xml                                        |   7 -------
 tools/lib/netty-3.9.0.Final.jar                  | Bin 1231993 -> 0 bytes
 .../cassandra/stress/util/JavaDriverClient.java  |   4 ++++
 3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26bd5124/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d5e3869..2723b4d 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,6 @@
     <property name="build.src.resources" value="${basedir}/src/resources"/>
     <property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
     <property name="build.lib" value="${basedir}/lib"/>
-    <property name="build.tools.lib" value="${basedir}/tools/lib"/>
     <property name="build.dir" value="${basedir}/build"/>
     <property name="build.dir.lib" value="${basedir}/build/lib"/>
     <property name="build.test.dir" value="${build.dir}/test"/>
@@ -769,9 +768,6 @@
                     <fileset dir="${build.lib}">
                         <include name="**/*.jar" />
                     </fileset>
-                    <fileset dir="${build.tools.lib}">
-                        <include name="**/*.jar" />
-                    </fileset>
                 </path>
             </classpath>
         </javac>
@@ -996,9 +992,6 @@
         <fileset dir="${build.dir}/tools/lib/">
             <include name="*.jar" />
         </fileset>
-        <fileset dir="${build.tools.lib}">
-            <include name="*.jar" />
-        </fileset>
       </copy>
       <artifact:writepom pomRefId="dist-pom" 
             file="${build.dir}/${final.name}-dist.pom"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26bd5124/tools/lib/netty-3.9.0.Final.jar
----------------------------------------------------------------------
diff --git a/tools/lib/netty-3.9.0.Final.jar b/tools/lib/netty-3.9.0.Final.jar
deleted file mode 100644
index 872340e..0000000
Binary files a/tools/lib/netty-3.9.0.Final.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/26bd5124/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 fa04dbc..d82ebfd 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
@@ -89,9 +89,13 @@ public class JavaDriverClient
 
     public void connect(ProtocolOptions.Compression compression) throws Exception
     {
+        PoolingOptions poolingOpts = new PoolingOptions();
+        poolingOpts.setCoreConnectionsPerHost(HostDistance.LOCAL, 8);
         Cluster.Builder clusterBuilder = Cluster.builder()
                                                 .addContactPoint(host)
                                                 .withPort(port)
+                                                .withPoolingOptions(poolingOpts)
+                                                .withProtocolVersion(ProtocolVersion.V2)
                                                 .withoutMetrics(); // The driver uses metrics 3 with conflict with our version
         if (whitelist != null)
             clusterBuilder.withLoadBalancingPolicy(whitelist);