Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59d4c271 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59d4c271 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59d4c271 Branch: refs/heads/trunk Commit: 59d4c27194c06d593523f40fa2fca819ef5046a4 Parents: 7f8417c 6a1b1f2 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Tue Aug 22 09:33:07 2017 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Tue Aug 22 09:33:07 2017 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/org/apache/cassandra/stress/StressAction.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59d4c271/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0520477,97dda05..9e42ffb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.15 +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) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Don't let stress write warmup data if n=0 (CASSANDRA-13773) * Gossip thread slows down when using batch commit log (CASSANDRA-12966) * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884) * Fix digest calculation for counter cells (CASSANDRA-13750) http://git-wip-us.apache.org/repos/asf/cassandra/blob/59d4c271/tools/stress/src/org/apache/cassandra/stress/StressAction.java ---------------------------------------------------------------------- diff --cc tools/stress/src/org/apache/cassandra/stress/StressAction.java index 5a340e8,8b15e92..670c187 --- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java @@@ -94,13 -90,11 +101,11 @@@ public class StressAction implements Ru } // type provided separately to support recursive call for mixed command with each command type it is performing + @SuppressWarnings("resource") // warmupOutput doesn't need closing private void warmup(OpDistributionFactory operations) { - PrintStream warmupOutput = new PrintStream(new OutputStream() { @Override public void write(int b) throws IOException { } } ); // do 25% of iterations as warmup but no more than 50k (by default hotspot compiles methods after 10k invocations) - int iterations = (settings.command.count > 0 - ? Math.min(50000, (int)(settings.command.count * 0.25)) - : 50000) * settings.node.nodes.size(); + int iterations = Math.min(50000, (int) (settings.command.count * 0.25)) * settings.node.nodes.size(); int threads = 100; if (settings.rate.maxThreads > 0) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
