natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix stress

This commit is contained in:
Sylvain Lebresne 2014-02-12 18:27:32 +01:00
parent f5b3515eec
commit 0d0acac6c5
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT-jar-with-dependencies.jar
View File

Binary file not shown.

BIN
tools/lib/cassandra-driver-core-2.0.0-rc2-SNAPSHOT.jar
View File

Binary file not shown.

BIN
tools/lib/cassandra-driver-core-2.0.0-rc3-SNAPSHOT.jar Normal file
View File

Binary file not shown.

9
tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
View File

@ -62,7 +62,9 @@ public class JavaDriverClient
public void connect(ProtocolOptions.Compression compression) throws Exception public void connect(ProtocolOptions.Compression compression) throws Exception
{ {
Cluster.Builder clusterBuilder = Cluster.builder() 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); clusterBuilder.withCompression(compression);
if (encryptionOptions.enabled) if (encryptionOptions.enabled)
{ {
@ -142,7 +144,6 @@ public class JavaDriverClient
public void disconnect() public void disconnect()
{ {
FBUtilities.waitOnFuture(cluster.shutdown()); cluster.close();
} }
}
}