You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/02/12 18:27:48 UTC
git commit: Fix stress
Updated Branches:
refs/heads/trunk f5b3515ee -> 0d0acac6c
Fix stress
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d0acac6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d0acac6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d0acac6
Branch: refs/heads/trunk
Commit: 0d0acac6c59d3fa703a3d504f9cfd063e4d111b7
Parents: f5b3515
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 12 18:27:32 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 12 18:27:32 2014 +0100
----------------------------------------------------------------------
...-2.0.0-rc2-SNAPSHOT-jar-with-dependencies.jar | Bin 5869229 -> 0 bytes
.../cassandra-driver-core-2.0.0-rc2-SNAPSHOT.jar | Bin 490145 -> 0 bytes
.../cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar | Bin 0 -> 515357 bytes
.../cassandra/stress/util/JavaDriverClient.java | 9 +++++----
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0acac6/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT-jar-with-dependencies.jar
----------------------------------------------------------------------
diff --git a/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT-jar-with-dependencies.jar b/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT-jar-with-dependencies.jar
deleted file mode 100644
index 1f4dafd..0000000
Binary files a/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT-jar-with-dependencies.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0acac6/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT.jar
----------------------------------------------------------------------
diff --git a/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT.jar b/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT.jar
deleted file mode 100644
index c0d4242..0000000
Binary files a/tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0acac6/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar
----------------------------------------------------------------------
diff --git a/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar b/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar
new file mode 100644
index 0000000..54a175f
Binary files /dev/null and b/tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d0acac6/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 cf37040..7bde900 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
@@ -62,7 +62,9 @@ public class JavaDriverClient
public void connect(ProtocolOptions.Compression compression) throws Exception
{
Cluster.Builder clusterBuilder = Cluster.builder()
- .addContactPoint(host).withPort(port);
+ .addContactPoint(host)
+ .withPort(port)
+ .withoutMetrics(); // The driver uses metrics 3 with conflict with our version
clusterBuilder.withCompression(compression);
if (encryptionOptions.enabled)
{
@@ -142,7 +144,6 @@ public class JavaDriverClient
public void disconnect()
{
- FBUtilities.waitOnFuture(cluster.shutdown());
+ cluster.close();
}
-
-}
\ No newline at end of file
+}