raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Avoid gossip merge when singleton cluster, see #2250

Browse source
This commit is contained in:
Patrik Nordwall 2012-06-19 16:00:45 +02:00
parent 09e92b6bd9
commit dccb0ca2d7
3 changed files with 23 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-cluster/src/main/scala/akka/cluster/Cluster.scala
View file

@ -893,7 +893,11 @@ class Cluster(system: ExtendedActorSystem, val failureDetector: FailureDetector)
val localGossip = localState.latestGossip
val winningGossip =
if (remoteGossip.version <> localGossip.version) {
if (isSingletonCluster(localState) && localGossip.overview.unreachable.isEmpty && remoteGossip.members.contains(self)) {
// a fresh singleton cluster that is joining, no need to merge, use received gossip
remoteGossip
} else if (remoteGossip.version <> localGossip.version) {
// concurrent
val mergedGossip = remoteGossip merge localGossip
val versionedMergedGossip = mergedGossip :+ vclockNode