Merge pull request #28843 from akka/wip-28842-parent-dispatcher-patriknw

fix DispatcherSameAsParent when using ClusterActorRefProvider, #28842

akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala

@@ -6,11 +6,16 @@ package akka.actor.testkit.typed.internal
 
 import java.lang.reflect.Modifier
 
+import scala.util.control.Exception.Catcher
+
 import akka.actor.typed.scaladsl.Behaviors
 import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props }
 import akka.annotation.InternalApi
 import scala.concurrent.{ Await, TimeoutException }
 import scala.concurrent.duration.Duration
+import scala.util.control.NonFatal
+
+import akka.actor.typed.scaladsl.ActorContext
 
 /**
  * INTERNAL API
@@ -29,11 +34,15 @@ private[akka] object ActorTestKitGuardian {
 
   val testKitGuardian: Behavior[TestKitCommand] = Behaviors.receive[TestKitCommand] {
     case (context, SpawnActor(name, behavior, reply, props)) =>
-      reply ! context.spawn(behavior, name, props)
+      try {
-      Behaviors.same
+        reply ! context.spawn(behavior, name, props)
+        Behaviors.same
+      } catch handleSpawnException(context, reply, props)
     case (context, SpawnActorAnonymous(behavior, reply, props)) =>
-      reply ! context.spawnAnonymous(behavior, props)
+      try {
-      Behaviors.same
+        reply ! context.spawnAnonymous(behavior, props)
+        Behaviors.same
+      } catch handleSpawnException(context, reply, props)
     case (context, StopActor(ref, reply)) =>
       context.watchWith(ref, ActorStopped(reply))
       context.stop(ref)
@@ -42,6 +51,16 @@ private[akka] object ActorTestKitGuardian {
       reply ! Ack
       Behaviors.same
   }
+
+  private def handleSpawnException[T](
+      context: ActorContext[ActorTestKitGuardian.TestKitCommand],
+      reply: ActorRef[ActorRef[T]],
+      props: Props): Catcher[Behavior[TestKitCommand]] = {
+    case NonFatal(e) =>
+      context.log.error(s"Spawn failed, props [$props]", e)
+      reply ! context.spawnAnonymous(Behaviors.stopped)
+      Behaviors.same
+  }
 }
 
 /**

akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala

@@ -10,11 +10,13 @@ import akka.actor.testkit.typed.scaladsl.ActorTestKit
 import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
 import akka.actor.testkit.typed.scaladsl.TestProbe
 import akka.actor.testkit.typed.scaladsl.LogCapturing
+import akka.actor.testkit.typed.scaladsl.LoggingTestKit
 import akka.actor.typed.ActorRef
 import akka.actor.typed.ActorSystem
 import akka.actor.typed.Behavior
 import akka.actor.typed.Props
 import akka.actor.typed.SpawnProtocol
+import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import org.scalatest.wordspec.AnyWordSpecLike
 
@@ -40,13 +42,15 @@ object DispatcherSelectorSpec {
 
 }
 
-class DispatcherSelectorSpec
+class DispatcherSelectorSpec(config: Config)
-    extends ScalaTestWithActorTestKit(DispatcherSelectorSpec.config)
+    extends ScalaTestWithActorTestKit(config)
     with AnyWordSpecLike
     with LogCapturing {
   import DispatcherSelectorSpec.PingPong
   import DispatcherSelectorSpec.PingPong._
 
+  def this() = this(DispatcherSelectorSpec.config)
+
   "DispatcherSelector" must {
 
     "select dispatcher from config" in {
@@ -58,6 +62,14 @@ class DispatcherSelectorSpec
       response.threadName should startWith("DispatcherSelectorSpec-ping-pong-dispatcher")
     }
 
+    "detect unknown dispatcher from config" in {
+      val probe = createTestProbe[Pong]()
+      LoggingTestKit.error("Spawn failed").expect {
+        val ref = spawn(PingPong(), Props.empty.withDispatcherFromConfig("unknown"))
+        probe.expectTerminated(ref)
+      }
+    }
+
     "select same dispatcher as parent" in {
       val parent = spawn(SpawnProtocol(), Props.empty.withDispatcherFromConfig("ping-pong-dispatcher"))
       val childProbe = createTestProbe[ActorRef[Ping]]()

akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala

@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2020 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package akka.cluster.typed
+
+import akka.actor.typed.scaladsl.DispatcherSelectorSpec
+import com.typesafe.config.ConfigFactory
+
+class ClusterDispatcherSelectorSpec
+    extends DispatcherSelectorSpec(ConfigFactory.parseString("""
+    akka.actor.provider = cluster
+    """).withFallback(DispatcherSelectorSpec.config)) {
+
+  // same tests as in DispatcherSelectorSpec
+
+}

akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala

@@ -372,9 +372,6 @@ private[akka] class RemoteActorRefProvider(
     if (systemService) local.actorOf(system, props, supervisor, path, systemService, deploy, lookupDeploy, async)
     else {
 
-      if (!system.dispatchers.hasDispatcher(props.dispatcher))
-        throw new ConfigurationException(s"Dispatcher [${props.dispatcher}] not configured for path $path")
-
       /*
        * This needs to deal with “mangled” paths, which are created by remote
        * deployment, also in this method. The scheme is the following: