You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/09/17 22:06:43 UTC
[06/17] cassandra git commit: Fix rare race where older gossip states
can be shadowed
Fix rare race where older gossip states can be shadowed
Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-10366
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f8e07ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f8e07ab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f8e07ab
Branch: refs/heads/cassandra-2.0
Commit: 6f8e07ab06c071cabc20c5cde06122ebf5a5aa78
Parents: 718e47f
Author: Brandon Williams <br...@apache.org>
Authored: Thu Sep 17 14:58:33 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Sep 17 14:58:33 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f8e07ab/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3c47427..658c19f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.17
+ * Fix rare race where older gossip states can be shadowed (CASSANDRA-10366)
* Fix consolidating racks violating the RF contract (CASSANDRA-10238)
* Disallow decommission when node is in drained state (CASSANDRA-8741)
* Backport CASSANDRA-8013 to 2.0 (CASSANDRA-10144)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f8e07ab/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 8c36223..44e464a 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -1139,7 +1139,6 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
localState.setHeartBeatState(remoteState.getHeartBeatState());
if (logger.isTraceEnabled())
logger.trace("Updating heartbeat state version to " + localState.getHeartBeatState().getHeartBeatVersion() + " from " + oldVersion + " for " + addr + " ...");
-
// we need to make two loops here, one to apply, then another to notify, this way all states in an update are present and current when the notifications are received
for (Entry<ApplicationState, VersionedValue> remoteEntry : remoteState.getApplicationStateMap().entrySet())
{
@@ -1385,8 +1384,9 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
logger.trace("Adding saved endpoint " + ep + " " + epState.getHeartBeatState().getGeneration());
}
- public void addLocalApplicationState(ApplicationState state, VersionedValue value)
+ private void addLocalApplicationStateInternal(ApplicationState state, VersionedValue value)
{
+ assert taskLock.isHeldByCurrentThread();
EndpointState epState = endpointStateMap.get(FBUtilities.getBroadcastAddress());
InetAddress epAddr = FBUtilities.getBroadcastAddress();
assert epState != null;
@@ -1401,6 +1401,11 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
doOnChangeNotifications(epAddr, state, value);
}
+ public void addLocalApplicationState(ApplicationState applicationState, VersionedValue value)
+ {
+ addLocalApplicationStates(Arrays.asList(Pair.create(applicationState, value)));
+ }
+
public void addLocalApplicationStates(List<Pair<ApplicationState, VersionedValue>> states)
{
taskLock.lock();
@@ -1408,7 +1413,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
for (Pair<ApplicationState, VersionedValue> pair : states)
{
- addLocalApplicationState(pair.left, pair.right);
+ addLocalApplicationStateInternal(pair.left, pair.right);
}
}
finally