Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a2f0da073 -> d0c166f92 refs/heads/cassandra-2.2 32457e7df -> dcada8baf refs/heads/cassandra-3.0 c163d0bc3 -> fb6160335 refs/heads/trunk aefb2a6ff -> 787b4fcbc
Add trampled commit back Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0c166f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0c166f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0c166f9 Branch: refs/heads/cassandra-2.1 Commit: d0c166f9260bcfde8d159c24e4c6cef5ddb61f20 Parents: a2f0da0 Author: Brandon Williams <[email protected]> Authored: Fri Sep 18 09:15:59 2015 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Sep 18 09:15:59 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0c166f9/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 f4764ce..808972a 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -1150,7 +1150,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()) { @@ -1396,8 +1395,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; @@ -1412,6 +1412,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(); @@ -1419,7 +1424,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean { for (Pair<ApplicationState, VersionedValue> pair : states) { - addLocalApplicationState(pair.left, pair.right); + addLocalApplicationStateInternal(pair.left, pair.right); } } finally
