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

Merge pull request #29617 from YikSanChan/fix/comment-index

Browse source 
Fix comment index
This commit is contained in:
Patrik Nordwall 2020-09-21 11:42:46 +02:00 • committed by GitHub
commit f5b16bfe2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,15 +175,15 @@ private[cluster] final case class Gossip(
vclock.prune(VectorClock.Node(Gossip.vclockName(node)))
}
// 2. merge members by selecting the single Member with highest MemberStatus out of the Member groups
// 3. merge members by selecting the single Member with highest MemberStatus out of the Member groups
val mergedMembers =
Gossip.emptyMembers.union(Member.pickHighestPriority(this.members, that.members, mergedTombstones))
// 3. merge reachability table by picking records with highest version
// 4. merge reachability table by picking records with highest version
val mergedReachability =
this.overview.reachability.merge(mergedMembers.map(_.uniqueAddress), that.overview.reachability)
// 4. Nobody can have seen this new gossip yet
// 5. Nobody can have seen this new gossip yet
val mergedSeen = Set.empty[UniqueAddress]
Gossip(mergedMembers, GossipOverview(mergedSeen, mergedReachability), mergedVClock, mergedTombstones)