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 2016/06/10 20:22:48 UTC
[1/6] cassandra git commit: StorageService shutdown hook should use a
volatile variable
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 360541f16 -> 1dffa0225
refs/heads/cassandra-3.0 6c867f003 -> c59897b6c
refs/heads/trunk 9530b27ad -> f0613bf6d
StorageService shutdown hook should use a volatile variable
patch by Ed Capriolo; reviewed by Stefania Alborghetti for CASSANDRA-11984
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dffa022
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dffa022
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dffa022
Branch: refs/heads/cassandra-2.2
Commit: 1dffa02250c493862f773af9b691a3bf3db6f76d
Parents: 360541f
Author: Edward Capriolo <ed...@gmail.com>
Authored: Fri Jun 10 10:45:57 2016 -0500
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Fri Jun 10 15:16:38 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ce48994..7ec3ae9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
* Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 83639e0..6b64664 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -212,7 +212,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner());
private Thread drainOnShutdown = null;
- private boolean inShutdownHook = false;
+ private volatile boolean inShutdownHook = false;
public static final StorageService instance = new StorageService();
[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c59897b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c59897b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c59897b6
Branch: refs/heads/cassandra-3.0
Commit: c59897b6cab7eff453c1cb759fb209d3d229f3c4
Parents: 6c867f0 1dffa02
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Jun 10 15:18:31 2016 -0500
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Fri Jun 10 15:18:31 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cdbaebb,7ec3ae9..fd2fe79
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.2.7
+3.0.8
+ * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
-
++Merged from 2.2:
+ * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
+
+3.0.7
+ * Fix legacy serialization of Thrift-generated non-compound range tombstones
+ when communicating with 2.x nodes (CASSANDRA-11930)
+ * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)
+ * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
+ * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
+ * Remove unneeded code to repair index summaries that have
+ been improperly down-sampled (CASSANDRA-11127)
+ * Avoid WriteTimeoutExceptions during commit log replay due to materialized
+ view lock contention (CASSANDRA-11891)
+ * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530)
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
* Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index eb56089,6b64664..5167151
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -221,10 -209,10 +221,10 @@@ public class StorageService extends Not
/* This abstraction maintains the token/endpoint metadata information */
private TokenMetadata tokenMetadata = new TokenMetadata();
- public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner());
+ public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(tokenMetadata.partitioner);
private Thread drainOnShutdown = null;
- private boolean inShutdownHook = false;
+ private volatile boolean inShutdownHook = false;
public static final StorageService instance = new StorageService();
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by st...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c59897b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c59897b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c59897b6
Branch: refs/heads/trunk
Commit: c59897b6cab7eff453c1cb759fb209d3d229f3c4
Parents: 6c867f0 1dffa02
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Jun 10 15:18:31 2016 -0500
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Fri Jun 10 15:18:31 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cdbaebb,7ec3ae9..fd2fe79
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,5 +1,25 @@@
-2.2.7
+3.0.8
+ * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
-
++Merged from 2.2:
+ * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
+
+3.0.7
+ * Fix legacy serialization of Thrift-generated non-compound range tombstones
+ when communicating with 2.x nodes (CASSANDRA-11930)
+ * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)
+ * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
+ * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
+ * Remove unneeded code to repair index summaries that have
+ been improperly down-sampled (CASSANDRA-11127)
+ * Avoid WriteTimeoutExceptions during commit log replay due to materialized
+ view lock contention (CASSANDRA-11891)
+ * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530)
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
* Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c59897b6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index eb56089,6b64664..5167151
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -221,10 -209,10 +221,10 @@@ public class StorageService extends Not
/* This abstraction maintains the token/endpoint metadata information */
private TokenMetadata tokenMetadata = new TokenMetadata();
- public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner());
+ public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(tokenMetadata.partitioner);
private Thread drainOnShutdown = null;
- private boolean inShutdownHook = false;
+ private volatile boolean inShutdownHook = false;
public static final StorageService instance = new StorageService();
[3/6] cassandra git commit: StorageService shutdown hook should use a
volatile variable
Posted by st...@apache.org.
StorageService shutdown hook should use a volatile variable
patch by Ed Capriolo; reviewed by Stefania Alborghetti for CASSANDRA-11984
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dffa022
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dffa022
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dffa022
Branch: refs/heads/trunk
Commit: 1dffa02250c493862f773af9b691a3bf3db6f76d
Parents: 360541f
Author: Edward Capriolo <ed...@gmail.com>
Authored: Fri Jun 10 10:45:57 2016 -0500
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Fri Jun 10 15:16:38 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ce48994..7ec3ae9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
* Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 83639e0..6b64664 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -212,7 +212,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner());
private Thread drainOnShutdown = null;
- private boolean inShutdownHook = false;
+ private volatile boolean inShutdownHook = false;
public static final StorageService instance = new StorageService();
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0613bf6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0613bf6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0613bf6
Branch: refs/heads/trunk
Commit: f0613bf6dafe405b5f65f56e436df1959172c245
Parents: 9530b27 c59897b
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Jun 10 15:18:58 2016 -0500
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Fri Jun 10 15:18:58 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0613bf6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 309a48d,fd2fe79..d699f93
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,9 +1,24 @@@
-3.0.8
+3.8
+ * Add bind variables to trace (CASSANDRA-11719)
+ * Switch counter shards' clock to timestamps (CASSANDRA-9811)
+ * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853)
+ * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718)
+ * Support older ant versions (CASSANDRA-11807)
+ * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
+ * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
+ * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
+ * Faster streaming (CASSANDRA-9766)
+ * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
+ * Add repaired percentage metric (CASSANDRA-11503)
+Merged from 3.0:
* Add TimeWindowCompactionStrategy (CASSANDRA-9666)
-
+ Merged from 2.2:
+ * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
-3.0.7
+3.7
+ * Support multiple folders for user defined compaction tasks (CASSANDRA-11765)
+ * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922)
+Merged from 3.0:
* Fix legacy serialization of Thrift-generated non-compound range tombstones
when communicating with 2.x nodes (CASSANDRA-11930)
* Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0613bf6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/6] cassandra git commit: StorageService shutdown hook should use a
volatile variable
Posted by st...@apache.org.
StorageService shutdown hook should use a volatile variable
patch by Ed Capriolo; reviewed by Stefania Alborghetti for CASSANDRA-11984
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dffa022
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dffa022
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dffa022
Branch: refs/heads/cassandra-3.0
Commit: 1dffa02250c493862f773af9b691a3bf3db6f76d
Parents: 360541f
Author: Edward Capriolo <ed...@gmail.com>
Authored: Fri Jun 10 10:45:57 2016 -0500
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Fri Jun 10 15:16:38 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ce48994..7ec3ae9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
* Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1dffa022/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 83639e0..6b64664 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -212,7 +212,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public volatile VersionedValue.VersionedValueFactory valueFactory = new VersionedValue.VersionedValueFactory(getPartitioner());
private Thread drainOnShutdown = null;
- private boolean inShutdownHook = false;
+ private volatile boolean inShutdownHook = false;
public static final StorageService instance = new StorageService();