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

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Stefania Alborghetti 2017-08-21 16:35:50 +08:00
parent b740efa731 1619413e56
commit 6e42dd215c
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -119,6 +119,7 @@
3.11.1
* Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938)
* Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744)
* "ignore" option is ignored in sstableloader (CASSANDRA-13721)
* Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)

34
tools/stress/src/org/apache/cassandra/stress/StressAction.java
View File

@ -418,23 +418,27 @@ public class StressAction implements Runnable
{
SimpleClient sclient = null;
JavaDriverClient jclient = null;
final ConnectionAPI clientType = settings.mode.api;
switch (clientType)
{
case JAVA_DRIVER_NATIVE:
jclient = settings.getJavaDriverClient();
break;
case SIMPLE_NATIVE:
sclient = settings.getSimpleNativeClient();
break;
default:
throw new IllegalStateException();
}
// synchronize the start of all the consumer threads
start.countDown();
try
{
switch (clientType)
{
case JAVA_DRIVER_NATIVE:
jclient = settings.getJavaDriverClient();
break;
case SIMPLE_NATIVE:
sclient = settings.getSimpleNativeClient();
break;
default:
throw new IllegalStateException();
}
}
finally
{
// synchronize the start of all the consumer threads
start.countDown();
}
releaseConsumers.await();