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:
Jay Zhuang 2018-12-06 16:43:48 -08:00
parent 82305d1c3e 6a449b88d9
commit 4dd7faa752
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -338,6 +338,7 @@
* Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
* Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870)
Merged from 3.0:
* Fix cassandra-stress write hang with default options (CASSANDRA-14616)
* Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)

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

@ -104,7 +104,11 @@ public class StressAction implements Runnable
private void warmup(OpDistributionFactory operations)
{
// do 25% of iterations as warmup but no more than 50k (by default hotspot compiles methods after 10k invocations)
int iterations = Math.min(50000, (int) (settings.command.count * 0.25)) * settings.node.nodes.size();
int iterations = (settings.command.count >= 0
? Math.min(50000, (int)(settings.command.count * 0.25))
: 50000) * settings.node.nodes.size();
if (iterations <= 0) return;
int threads = 100;
if (settings.rate.maxThreads > 0)