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

lazy init of SerializationExtension in Artery, #24620 (#24667)

Browse source 
to avoid loading serializers before ActorRefProvider has been initialized
This commit is contained in:
Patrik Nordwall 2018-03-09 08:59:33 +01:00 • committed by Konrad `ktoso` Malawski
parent 5be3c7bf83
commit 7d67524bb5
2 changed files with 49 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala
View file

@ -13,7 +13,6 @@ import akka.testkit.typed.scaladsl.{ ActorTestKit, TestProbe }
import akka.actor.typed.{ ActorRef, ActorRefResolver, Props, TypedAkkaSpecWithShutdown }
import akka.serialization.SerializerWithStringManifest
import com.typesafe.config.ConfigFactory
import scala.concurrent.Await
import scala.concurrent.duration._
@ -62,6 +61,9 @@ object ClusterSingletonApiSpec {
}
class PingSerializer(system: ExtendedActorSystem) extends SerializerWithStringManifest {
// Reproducer of issue #24620, by eagerly creating the ActorRefResolver in serializer
val actorRefResolver = ActorRefResolver(system.toTyped)
def identifier: Int = 47
def manifest(o: AnyRef): String = o match {
case _: Ping ⇒ "a"
@ -70,13 +72,13 @@ object ClusterSingletonApiSpec {
}
def toBinary(o: AnyRef): Array[Byte] = o match {
case p: Ping ⇒ ActorRefResolver(system.toTyped).toSerializationFormat(p.respondTo).getBytes(StandardCharsets.UTF_8)
case p: Ping ⇒ actorRefResolver.toSerializationFormat(p.respondTo).getBytes(StandardCharsets.UTF_8)
case Pong ⇒ Array.emptyByteArray
case Perish ⇒ Array.emptyByteArray
}
def fromBinary(bytes: Array[Byte], manifest: String): AnyRef = manifest match {
case "a" ⇒ Ping(ActorRefResolver(system.toTyped).resolveActorRef(new String(bytes, StandardCharsets.UTF_8)))
case "a" ⇒ Ping(actorRefResolver.resolveActorRef(new String(bytes, StandardCharsets.UTF_8)))
case "b" ⇒ Pong
case "c" ⇒ Perish
}