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

Merge branch 'wip-2552-terminate-remote-deployed-when-shutdown-patriknw' into wip-2551-terminate-when-remote-parent-lost-patriknw

Browse source 
Conflicts:
	akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
This commit is contained in:
Patrik Nordwall 2012-09-27 08:12:48 +02:00
commit 53af6333e6
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala
View file

@ -10,6 +10,7 @@ import akka.event.LoggingAdapter
import akka.dispatch.Watch
import akka.actor.ActorRefWithCell
import akka.actor.ActorRefScope
import akka.util.Switch
private[akka] sealed trait DaemonMsg
private[akka] case class DaemonMsgCreate(props: Props, deploy: Deploy, path: String, supervisor: ActorRef) extends DaemonMsg
@ -26,7 +27,7 @@ private[akka] class RemoteSystemDaemon(system: ActorSystemImpl, _path: ActorPath
import akka.actor.Guardian._
@volatile private var terminating = false
private val terminating = new Switch(false)
system.provider.systemGuardian.tell(RegisterTerminationHook, this)
@ -58,7 +59,7 @@ private[akka] class RemoteSystemDaemon(system: ActorSystemImpl, _path: ActorPath
}
override def !(msg: Any)(implicit sender: ActorRef = null): Unit = msg match {
case message: DaemonMsg if !terminating ⇒
case message: DaemonMsg ⇒
log.debug("Received command [{}] to RemoteSystemDaemon on [{}]", message, path.address)
message match {
case DaemonMsgCreate(props, deploy, path, supervisor) ⇒
@ -68,18 +69,19 @@ private[akka] class RemoteSystemDaemon(system: ActorSystemImpl, _path: ActorPath
// TODO RK canonicalize path so as not to duplicate it always #1446
val subpath = elems.drop(1)
val path = this.path / subpath
val actor = system.provider.actorOf(system, props, supervisor.asInstanceOf[InternalActorRef],
path, systemService = false, Some(deploy), lookupDeploy = true, async = false)
addChild(subpath.mkString("/"), actor)
actor.sendSystemMessage(Watch(actor, this))
terminating.fold(
log.debug("Skipping [{}] to RemoteSystemDaemon on [{}] while terminating", message, path.address)) {
val actor = system.provider.actorOf(system, props, supervisor.asInstanceOf[InternalActorRef],
path, systemService = false, Some(deploy), lookupDeploy = true, async = false)
addChild(subpath.mkString("/"), actor)
actor.sendSystemMessage(Watch(actor, this))
}
case _ ⇒
log.error("remote path does not match path from message [{}]", message)
}
}
case message: DaemonMsg if terminating ⇒
log.debug("Skipping [{}] to RemoteSystemDaemon on [{}] while terminating", message, path.address)
case Terminated(child: ActorRefWithCell) if child.asInstanceOf[ActorRefScope].isLocal ⇒
removeChild(child.path.elements.drop(1).mkString("/"))
terminationHookDoneWhenNoChildren()
@ -87,9 +89,10 @@ private[akka] class RemoteSystemDaemon(system: ActorSystemImpl, _path: ActorPath
case t: Terminated ⇒
case TerminationHook ⇒
terminating = true
terminationHookDoneWhenNoChildren()
allChildren foreach system.stop
terminating.switchOn {
terminationHookDoneWhenNoChildren()
allChildren foreach system.stop
}
case AddressTerminated(address) ⇒
allChildren foreach { case a: InternalActorRef if a.getParent.path.address == address ⇒ system.stop(a) }
@ -97,7 +100,7 @@ private[akka] class RemoteSystemDaemon(system: ActorSystemImpl, _path: ActorPath
case unknown ⇒ log.warning("Unknown message {} received by {}", unknown, this)
}
def terminationHookDoneWhenNoChildren(): Unit = if (terminating && !hasChildren)
def terminationHookDoneWhenNoChildren(): Unit = if (terminating.isOn && !hasChildren)
system.provider.systemGuardian.tell(TerminationHookDone, this)
}