You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/02/08 16:54:27 UTC
[04/10] cassandra git commit: Gossiper#isEnabled is not thread safe
Gossiper#isEnabled is not thread safe
patch by aweisberg; reviewed by jasobrown for CASSANDRA-11116
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fe70c65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fe70c65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fe70c65
Branch: refs/heads/trunk
Commit: 6fe70c65291d01f1f1b1c5edaa727fbbb79eb617
Parents: dd23adf
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Fri Feb 5 13:59:38 2016 -0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Feb 8 15:50:59 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fe70c65/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 054ad1d..806e6d5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.1.14
+ * Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
+
+
2.1.13
* Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
* test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fe70c65/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index ebdd5bd..ae99829 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -78,7 +78,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
}
- private ScheduledFuture<?> scheduledGossipTask;
+ private volatile ScheduledFuture<?> scheduledGossipTask;
private static final ReentrantLock taskLock = new ReentrantLock();
public final static int intervalInMillis = 1000;
public final static int QUARANTINE_DELAY = StorageService.RING_DELAY * 2;