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/21 08:38:18 UTC
[1/3] cassandra git commit: Fix cassandra-stress hang issues when an
error during cluster connection happens
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 01f2855b4 -> 1619413e5
refs/heads/trunk b740efa73 -> 6e42dd215
Fix cassandra-stress hang issues when an error during cluster connection happens
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-12938
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1619413e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1619413e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1619413e
Branch: refs/heads/cassandra-3.11
Commit: 1619413e5602b93641af1ccf5adbee80eaa2b53c
Parents: 01f2855
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Aug 21 11:36:08 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Aug 21 11:36:25 2017 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/StressAction.java | 40 +++++++++++---------
2 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1619413e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4ede932..48c21cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1619413e/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 30f8899..5a340e8 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -420,27 +420,31 @@ public class StressAction implements Runnable
SimpleClient sclient = null;
ThriftClient tclient = null;
JavaDriverClient jclient = null;
-
-
final ConnectionAPI clientType = settings.mode.api;
- switch (clientType)
+
+ try
{
- case JAVA_DRIVER_NATIVE:
- jclient = settings.getJavaDriverClient();
- break;
- case SIMPLE_NATIVE:
- sclient = settings.getSimpleNativeClient();
- break;
- case THRIFT:
- case THRIFT_SMART:
- tclient = settings.getThriftClient();
- break;
- default:
- throw new IllegalStateException();
+ switch (clientType)
+ {
+ case JAVA_DRIVER_NATIVE:
+ jclient = settings.getJavaDriverClient();
+ break;
+ case SIMPLE_NATIVE:
+ sclient = settings.getSimpleNativeClient();
+ break;
+ case THRIFT:
+ case THRIFT_SMART:
+ tclient = settings.getThriftClient();
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+ }
+ finally
+ {
+ // synchronize the start of all the consumer threads
+ start.countDown();
}
-
- // synchronize the start of all the consumer threads
- start.countDown();
releaseConsumers.await();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] 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/6e42dd21
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e42dd21
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e42dd21
Branch: refs/heads/trunk
Commit: 6e42dd215cd55b933691379ee5f96fbdeea9cc78
Parents: b740efa 1619413
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Aug 21 16:35:50 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Aug 21 16:35:50 2017 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/StressAction.java | 32 +++++++++++---------
2 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e42dd21/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1f67f3b,48c21cc..9ba081f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,124 -1,5 +1,125 @@@
+4.0
+ * Add bytes repaired/unrepaired to nodetool tablestats (CASSANDRA-13774)
+ * Don't delete incremental repair sessions if they still have sstables (CASSANDRA-13758)
+ * Fix pending repair manager index out of bounds check (CASSANDRA-13769)
+ * Don't use RangeFetchMapCalculator when RF=1 (CASSANDRA-13576)
+ * Don't optimise trivial ranges in RangeFetchMapCalculator (CASSANDRA-13664)
+ * Use an ExecutorService for repair commands instead of new Thread(..).start() (CASSANDRA-13594)
+ * Fix race / ref leak in anticompaction (CASSANDRA-13688)
+ * Expose tasks queue length via JMX (CASSANDRA-12758)
+ * Fix race / ref leak in PendingRepairManager (CASSANDRA-13751)
+ * Enable ppc64le runtime as unsupported architecture (CASSANDRA-13615)
+ * Improve sstablemetadata output (CASSANDRA-11483)
+ * Support for migrating legacy users to roles has been dropped (CASSANDRA-13371)
+ * Introduce error metrics for repair (CASSANDRA-13387)
+ * Refactoring to primitive functional interfaces in AuthCache (CASSANDRA-13732)
+ * Update metrics to 3.1.5 (CASSANDRA-13648)
+ * batch_size_warn_threshold_in_kb can now be set at runtime (CASSANDRA-13699)
+ * Avoid always rebuilding secondary indexes at startup (CASSANDRA-13725)
+ * Upgrade JMH from 1.13 to 1.19 (CASSANDRA-13727)
+ * Upgrade SLF4J from 1.7.7 to 1.7.25 (CASSANDRA-12996)
+ * Default for start_native_transport now true if not set in config (CASSANDRA-13656)
+ * Don't add localhost to the graph when calculating where to stream from (CASSANDRA-13583)
+ * Allow skipping equality-restricted clustering columns in ORDER BY clause (CASSANDRA-10271)
+ * Use common nowInSec for validation compactions (CASSANDRA-13671)
+ * Improve handling of IR prepare failures (CASSANDRA-13672)
+ * Send IR coordinator messages synchronously (CASSANDRA-13673)
+ * Flush system.repair table before IR finalize promise (CASSANDRA-13660)
+ * Fix column filter creation for wildcard queries (CASSANDRA-13650)
+ * Add 'nodetool getbatchlogreplaythrottle' and 'nodetool setbatchlogreplaythrottle' (CASSANDRA-13614)
+ * fix race condition in PendingRepairManager (CASSANDRA-13659)
+ * Allow noop incremental repair state transitions (CASSANDRA-13658)
+ * Run repair with down replicas (CASSANDRA-10446)
+ * Added started & completed repair metrics (CASSANDRA-13598)
+ * Added started & completed repair metrics (CASSANDRA-13598)
+ * Improve secondary index (re)build failure and concurrency handling (CASSANDRA-10130)
+ * Improve calculation of available disk space for compaction (CASSANDRA-13068)
+ * Change the accessibility of RowCacheSerializer for third party row cache plugins (CASSANDRA-13579)
+ * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570)
+ * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585)
+ * Fix Randomness of stress values (CASSANDRA-12744)
+ * Allow selecting Map values and Set elements (CASSANDRA-7396)
+ * Fast and garbage-free Streaming Histogram (CASSANDRA-13444)
+ * Update repairTime for keyspaces on completion (CASSANDRA-13539)
+ * Add configurable upper bound for validation executor threads (CASSANDRA-13521)
+ * Bring back maxHintTTL propery (CASSANDRA-12982)
+ * Add testing guidelines (CASSANDRA-13497)
+ * Add more repair metrics (CASSANDRA-13531)
+ * RangeStreamer should be smarter when picking endpoints for streaming (CASSANDRA-4650)
+ * Avoid rewrapping an exception thrown for cache load functions (CASSANDRA-13367)
+ * Log time elapsed for each incremental repair phase (CASSANDRA-13498)
+ * Add multiple table operation support to cassandra-stress (CASSANDRA-8780)
+ * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262)
+ * Fix WriteResponseHandlerTest is sensitive to test execution order (CASSANDRA-13421)
+ * Improve incremental repair logging (CASSANDRA-13468)
+ * Start compaction when incremental repair finishes (CASSANDRA-13454)
+ * Add repair streaming preview (CASSANDRA-13257)
+ * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430)
+ * Change protocol to allow sending key space independent of query string (CASSANDRA-10145)
+ * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661)
+ * Take number of files in L0 in account when estimating remaining compaction tasks (CASSANDRA-13354)
+ * Skip building views during base table streams on range movements (CASSANDRA-13065)
+ * Improve error messages for +/- operations on maps and tuples (CASSANDRA-13197)
+ * Remove deprecated repair JMX APIs (CASSANDRA-11530)
+ * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
+ * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289)
+ * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
+ * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
+ * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
+ * Upgrade snappy-java to 1.1.2.6 (CASSANDRA-13336)
+ * Incremental repair not streaming correct sstables (CASSANDRA-13328)
+ * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)
+ * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132)
+ * Remove config option index_interval (CASSANDRA-10671)
+ * Reduce lock contention for collection types and serializers (CASSANDRA-13271)
+ * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283)
+ * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292)
+ * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520)
+ * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226)
+ * Remove unused method (CASSANDRA-13227)
+ * Fix minor bugs related to #9143 (CASSANDRA-13217)
+ * Output warning if user increases RF (CASSANDRA-13079)
+ * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081)
+ * Add support for + and - operations on dates (CASSANDRA-11936)
+ * Fix consistency of incrementally repaired data (CASSANDRA-9143)
+ * Increase commitlog version (CASSANDRA-13161)
+ * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
+ * Refactor ColumnCondition (CASSANDRA-12981)
+ * Parallelize streaming of different keyspaces (CASSANDRA-4663)
+ * Improved compactions metrics (CASSANDRA-13015)
+ * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
+ * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
+ * Thrift removal (CASSANDRA-11115)
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+ * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
+ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
+ * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510)
+ * Allow IN restrictions on column families with collections (CASSANDRA-12654)
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
+ * Add mutation size and batch metrics (CASSANDRA-12649)
+ * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Add histogram for delay to deliver hints (CASSANDRA-13234)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720)
+ * Trivial format error in StorageProxy (CASSANDRA-13551)
+ * Nodetool repair can hang forever if we lose the notification for the repair completing/failing (CASSANDRA-13480)
+ * Anticompaction can cause noisy log messages (CASSANDRA-13684)
+ * Switch to client init for sstabledump (CASSANDRA-13683)
+ * CQLSH: Don't pause when capturing data (CASSANDRA-13743)
+
+
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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e42dd21/tools/stress/src/org/apache/cassandra/stress/StressAction.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/StressAction.java
index a90f9ff,5a340e8..e634f14
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@@ -417,24 -418,33 +417,28 @@@ public class StressAction implements Ru
try
{
SimpleClient sclient = null;
- ThriftClient tclient = null;
JavaDriverClient jclient = null;
-
-
final ConnectionAPI clientType = settings.mode.api;
- switch (clientType)
+
+ try
{
- case JAVA_DRIVER_NATIVE:
- jclient = settings.getJavaDriverClient();
- break;
- case SIMPLE_NATIVE:
- sclient = settings.getSimpleNativeClient();
- break;
- default:
- throw new IllegalStateException();
+ switch (clientType)
+ {
+ case JAVA_DRIVER_NATIVE:
+ jclient = settings.getJavaDriverClient();
+ break;
+ case SIMPLE_NATIVE:
+ sclient = settings.getSimpleNativeClient();
+ break;
- case THRIFT:
- case THRIFT_SMART:
- tclient = settings.getThriftClient();
- break;
+ default:
+ throw new IllegalStateException();
+ }
+ }
+ finally
+ {
+ // synchronize the start of all the consumer threads
+ start.countDown();
}
-
- // synchronize the start of all the consumer threads
- start.countDown();
releaseConsumers.await();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: Fix cassandra-stress hang issues when an
error during cluster connection happens
Posted by st...@apache.org.
Fix cassandra-stress hang issues when an error during cluster connection happens
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-12938
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1619413e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1619413e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1619413e
Branch: refs/heads/trunk
Commit: 1619413e5602b93641af1ccf5adbee80eaa2b53c
Parents: 01f2855
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Mon Aug 21 11:36:08 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Aug 21 11:36:25 2017 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/stress/StressAction.java | 40 +++++++++++---------
2 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1619413e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4ede932..48c21cc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
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)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1619413e/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 30f8899..5a340e8 100644
--- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java
@@ -420,27 +420,31 @@ public class StressAction implements Runnable
SimpleClient sclient = null;
ThriftClient tclient = null;
JavaDriverClient jclient = null;
-
-
final ConnectionAPI clientType = settings.mode.api;
- switch (clientType)
+
+ try
{
- case JAVA_DRIVER_NATIVE:
- jclient = settings.getJavaDriverClient();
- break;
- case SIMPLE_NATIVE:
- sclient = settings.getSimpleNativeClient();
- break;
- case THRIFT:
- case THRIFT_SMART:
- tclient = settings.getThriftClient();
- break;
- default:
- throw new IllegalStateException();
+ switch (clientType)
+ {
+ case JAVA_DRIVER_NATIVE:
+ jclient = settings.getJavaDriverClient();
+ break;
+ case SIMPLE_NATIVE:
+ sclient = settings.getSimpleNativeClient();
+ break;
+ case THRIFT:
+ case THRIFT_SMART:
+ tclient = settings.getThriftClient();
+ break;
+ default:
+ throw new IllegalStateException();
+ }
+ }
+ finally
+ {
+ // synchronize the start of all the consumer threads
+ start.countDown();
}
-
- // synchronize the start of all the consumer threads
- start.countDown();
releaseConsumers.await();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org