You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2017/08/22 01:38:39 UTC
[1/6] cassandra git commit: Don't let stress write warmup data if n=0
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 ec85b4a96 -> 6a1b1f26b
refs/heads/cassandra-3.11 7f8417c40 -> 59d4c2719
refs/heads/trunk 97b1c3ce8 -> 3d4a7e7b6
Don't let stress write warmup data if n=0
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-13773
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a1b1f26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a1b1f26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a1b1f26
Branch: refs/heads/cassandra-3.0
Commit: 6a1b1f26b7174e8c9bf86a96514ab626ce2a4117
Parents: ec85b4a
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Aug 21 11:11:00 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Aug 22 09:28:00 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/6a1b1f26/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d8b22f0..97dda05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * 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/6a1b1f26/tools/stress/src/org/apache/cassandra/stress/StressAction.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index cda54a0..8b15e92 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -54,6 +54,13 @@ public class StressAction implements Runnable
// creating keyspace and column families
settings.maybeCreateKeyspaces();
+ if (settings.command.count == 0)
+ {
+ output.println("N=0: SCHEMA CREATED, NOTHING ELSE DONE.");
+ settings.disconnect();
+ return;
+ }
+
output.println("Sleeping 2s...");
Uninterruptibles.sleepUninterruptibly(2, TimeUnit.SECONDS);
@@ -87,9 +94,7 @@ public class StressAction implements Runnable
{
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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Don't let stress write warmup data if n=0
Posted by st...@apache.org.
Don't let stress write warmup data if n=0
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-13773
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a1b1f26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a1b1f26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a1b1f26
Branch: refs/heads/cassandra-3.11
Commit: 6a1b1f26b7174e8c9bf86a96514ab626ce2a4117
Parents: ec85b4a
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Aug 21 11:11:00 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Aug 22 09:28:00 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/6a1b1f26/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d8b22f0..97dda05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * 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/6a1b1f26/tools/stress/src/org/apache/cassandra/stress/StressAction.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index cda54a0..8b15e92 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -54,6 +54,13 @@ public class StressAction implements Runnable
// creating keyspace and column families
settings.maybeCreateKeyspaces();
+ if (settings.command.count == 0)
+ {
+ output.println("N=0: SCHEMA CREATED, NOTHING ELSE DONE.");
+ settings.disconnect();
+ return;
+ }
+
output.println("Sleeping 2s...");
Uninterruptibles.sleepUninterruptibly(2, TimeUnit.SECONDS);
@@ -87,9 +94,7 @@ public class StressAction implements Runnable
{
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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Don't let stress write warmup data if n=0
Posted by st...@apache.org.
Don't let stress write warmup data if n=0
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-13773
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a1b1f26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a1b1f26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a1b1f26
Branch: refs/heads/trunk
Commit: 6a1b1f26b7174e8c9bf86a96514ab626ce2a4117
Parents: ec85b4a
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Aug 21 11:11:00 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Aug 22 09:28:00 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/6a1b1f26/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d8b22f0..97dda05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * 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/6a1b1f26/tools/stress/src/org/apache/cassandra/stress/StressAction.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
index cda54a0..8b15e92 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -54,6 +54,13 @@ public class StressAction implements Runnable
// creating keyspace and column families
settings.maybeCreateKeyspaces();
+ if (settings.command.count == 0)
+ {
+ output.println("N=0: SCHEMA CREATED, NOTHING ELSE DONE.");
+ settings.disconnect();
+ return;
+ }
+
output.println("Sleeping 2s...");
Uninterruptibles.sleepUninterruptibly(2, TimeUnit.SECONDS);
@@ -87,9 +94,7 @@ public class StressAction implements Runnable
{
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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
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/cassandra-3.11
Commit: 59d4c27194c06d593523f40fa2fca819ef5046a4
Parents: 7f8417c 6a1b1f2
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Aug 22 09:33:07 2017 +0800
Committer: Stefania Alborghetti <st...@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d4a7e7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d4a7e7b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d4a7e7b
Branch: refs/heads/trunk
Commit: 3d4a7e7b61c7eb2c8736fce2bde47c14564d5982
Parents: 97b1c3c 59d4c27
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Aug 22 09:36:23 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Tue Aug 22 09:36:23 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/3d4a7e7b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 59b401c,9e42ffb..75a4be9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -126,6 -6,8 +126,7 @@@
* 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)
* Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d4a7e7b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@apache.org.
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 <st...@datastax.com>
Authored: Tue Aug 22 09:33:07 2017 +0800
Committer: Stefania Alborghetti <st...@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org