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

!clu #3920 Remove deprecated Cluster.publishCurrentClusterState

Browse source
This commit is contained in:
Patrik Nordwall 2014-03-12 11:38:09 +01:00
parent 4b977361eb
commit 503c4ced8f
5 changed files with 14 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

27
akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala
View file

@ -328,12 +328,12 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
}
def receive = {
case PublishChanges(newGossip) ⇒ publishChanges(newGossip)
case currentStats: CurrentInternalStats ⇒ publishInternalStats(currentStats)
case PublishCurrentClusterState(receiver) ⇒ publishCurrentClusterState(receiver)
case Subscribe(subscriber, initMode, to) ⇒ subscribe(subscriber, initMode, to)
case Unsubscribe(subscriber, to) ⇒ unsubscribe(subscriber, to)
case PublishEvent(event) ⇒ publish(event)
case PublishChanges(newGossip) ⇒ publishChanges(newGossip)
case currentStats: CurrentInternalStats ⇒ publishInternalStats(currentStats)
case SendCurrentClusterState(receiver) ⇒ sendCurrentClusterState(receiver)
case Subscribe(subscriber, initMode, to) ⇒ subscribe(subscriber, initMode, to)
case Unsubscribe(subscriber, to) ⇒ unsubscribe(subscriber, to)
case PublishEvent(event) ⇒ publish(event)
}
def eventStream: EventStream = context.system.eventStream
@ -342,17 +342,14 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
* The current snapshot state corresponding to latest gossip
* to mimic what you would have seen if you were listening to the events.
*/
def publishCurrentClusterState(receiver: Option[ActorRef]): Unit = {
def sendCurrentClusterState(receiver: ActorRef): Unit = {
val state = CurrentClusterState(
members = latestGossip.members,
unreachable = latestGossip.overview.reachability.allUnreachableOrTerminated map latestGossip.member,
seenBy = latestGossip.seenBy.map(_.address),
leader = latestGossip.leader.map(_.address),
roleLeaderMap = latestGossip.allRoles.map(r ⇒ r -> latestGossip.roleLeader(r).map(_.address))(collection.breakOut))
receiver match {
case Some(ref) ⇒ ref ! state
case None ⇒ publish(state)
}
receiver ! state
}
def subscribe(subscriber: ActorRef, initMode: SubscriptionInitialStateMode, to: Set[Class[_]]): Unit = {
@ -364,7 +361,7 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
}
publishDiff(Gossip.empty, latestGossip, pub)
case InitialStateAsSnapshot ⇒
publishCurrentClusterState(Some(subscriber))
sendCurrentClusterState(subscriber)
}
to foreach { eventStream.subscribe(subscriber, _) }
@ -397,12 +394,6 @@ private[cluster] final class ClusterDomainEventPublisher extends Actor with Acto
def publish(event: AnyRef): Unit = eventStream publish event
def publishStart(): Unit =
if (latestGossip ne Gossip.empty) {
clearState()
publishCurrentClusterState(None)
}
def clearState(): Unit = {
latestGossip = Gossip.empty
}