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

supervision in AdapterClusterImpl (#27862)

Browse source 
* methods like cluster.join and cluster.subscribe may throw exception if called
  with invalid parameters
* the manager and subscriptions actors should survive such exceptions
This commit is contained in:
Patrik Nordwall 2019-10-03 09:02:29 +02:00 • committed by Christopher Batey
parent b544359502
commit 064f06f5a6
1 changed files with 71 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

37
akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala
View file

@ -4,7 +4,9 @@
package akka.cluster.typed.internal package akka.cluster.typed.internal
import akka.actor.typed.Behavior
import akka.actor.typed.Props import akka.actor.typed.Props
import akka.actor.typed.SupervisorStrategy
import akka.annotation.InternalApi import akka.annotation.InternalApi
import akka.cluster.ClusterEvent.MemberEvent import akka.cluster.ClusterEvent.MemberEvent
import akka.cluster.{ ClusterEvent, Member, MemberStatus } import akka.cluster.{ ClusterEvent, Member, MemberStatus }
@ -25,8 +27,8 @@ private[akka] object AdapterClusterImpl {
private case object Up extends SeenState private case object Up extends SeenState
private case class Removed(previousStatus: MemberStatus) extends SeenState private case class Removed(previousStatus: MemberStatus) extends SeenState
private def subscriptionsBehavior(adaptedCluster: akka.cluster.Cluster) = Behaviors.setup[ClusterStateSubscription] { private def subscriptionsBehavior(adaptedCluster: akka.cluster.Cluster): Behavior[ClusterStateSubscription] =
ctx => Behaviors.setup[ClusterStateSubscription] { ctx =>
var seenState: SeenState = BeforeUp var seenState: SeenState = BeforeUp
var upSubscribers: List[ActorRef[SelfUp]] = Nil var upSubscribers: List[ActorRef[SelfUp]] = Nil
var removedSubscribers: List[ActorRef[SelfRemoved]] = Nil var removedSubscribers: List[ActorRef[SelfRemoved]] = Nil
@ -35,6 +37,7 @@ private[akka] object AdapterClusterImpl {
// important to not eagerly refer to it or we get a cycle here // important to not eagerly refer to it or we get a cycle here
lazy val cluster = Cluster(ctx.system) lazy val cluster = Cluster(ctx.system)
def onSelfMemberEvent(event: MemberEvent): Unit = { def onSelfMemberEvent(event: MemberEvent): Unit = {
event match { event match {
case ClusterEvent.MemberUp(_) => case ClusterEvent.MemberUp(_) =>
@ -54,8 +57,7 @@ private[akka] object AdapterClusterImpl {
} }
Behaviors Behaviors
.receive[AnyRef] { (ctx, msg) => .receiveMessage[AnyRef] {
msg match {
case Subscribe(subscriber: ActorRef[SelfUp] @unchecked, clazz) if clazz == classOf[SelfUp] => case Subscribe(subscriber: ActorRef[SelfUp] @unchecked, clazz) if clazz == classOf[SelfUp] =>
seenState match { seenState match {
case Up => subscriber ! SelfUp(adaptedCluster.state) case Up => subscriber ! SelfUp(adaptedCluster.state)
@ -76,8 +78,10 @@ private[akka] object AdapterClusterImpl {
Behaviors.same Behaviors.same
case Subscribe(subscriber, eventClass) => case Subscribe(subscriber, eventClass) =>
adaptedCluster adaptedCluster.subscribe(
.subscribe(subscriber.toClassic, initialStateMode = ClusterEvent.initialStateAsEvents, eventClass) subscriber.toClassic,
initialStateMode = ClusterEvent.initialStateAsEvents,
eventClass)
Behaviors.same Behaviors.same
case Unsubscribe(subscriber) => case Unsubscribe(subscriber) =>
@ -96,7 +100,6 @@ private[akka] object AdapterClusterImpl {
Behaviors.same Behaviors.same
} }
}
.receiveSignal { .receiveSignal {
case (_, Terminated(ref)) => case (_, Terminated(ref)) =>
@ -108,9 +111,8 @@ private[akka] object AdapterClusterImpl {
.narrow[ClusterStateSubscription] .narrow[ClusterStateSubscription]
} }
private def managerBehavior(adaptedCluster: akka.cluster.Cluster) = private def managerBehavior(adaptedCluster: akka.cluster.Cluster): Behavior[ClusterCommand] = {
Behaviors.receive[ClusterCommand]((_, msg) => Behaviors.receiveMessage {
msg match {
case Join(address) => case Join(address) =>
adaptedCluster.join(address) adaptedCluster.join(address)
Behaviors.same Behaviors.same
@ -127,7 +129,8 @@ private[akka] object AdapterClusterImpl {
adaptedCluster.joinSeedNodes(addresses) adaptedCluster.joinSeedNodes(addresses)
Behaviors.same Behaviors.same
}) }
}
} }
@ -147,9 +150,17 @@ private[akka] final class AdapterClusterImpl(system: ActorSystem[_]) extends Clu
// must not be lazy as it also updates the cached selfMember // must not be lazy as it also updates the cached selfMember
override val subscriptions: ActorRef[ClusterStateSubscription] = override val subscriptions: ActorRef[ClusterStateSubscription] =
system.internalSystemActorOf(subscriptionsBehavior(classicCluster), "clusterStateSubscriptions", Props.empty) system.internalSystemActorOf(
// resume supervision: has state that shouldn't be lost in case of failure
Behaviors.supervise(subscriptionsBehavior(classicCluster)).onFailure(SupervisorStrategy.resume),
"clusterStateSubscriptions",
Props.empty)
override lazy val manager: ActorRef[ClusterCommand] = override lazy val manager: ActorRef[ClusterCommand] =
system.internalSystemActorOf(managerBehavior(classicCluster), "clusterCommandManager", Props.empty) system.internalSystemActorOf(
// restart supervision: no state lost in case of failure
Behaviors.supervise(managerBehavior(classicCluster)).onFailure(SupervisorStrategy.restart),
"clusterCommandManager",
Props.empty)
} }