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

Fix DaemonMsgCreateSerializer #22225

Browse source
This commit is contained in:
Johan Andrén 2017-02-21 16:08:16 +01:00 • committed by GitHub
parent ad4164d5e3
commit 734c31fa4f
6 changed files with 812 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

63
akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerSpec.scala
View file

@ -8,25 +8,26 @@ import language.postfixOps
import akka.serialization.SerializationExtension
import com.typesafe.config.ConfigFactory
import akka.testkit.AkkaSpec
import akka.actor.{ Actor, Address, Props, Deploy, OneForOneStrategy, SupervisorStrategy }
import akka.actor.{ Actor, ActorRef, Address, Deploy, ExtendedActorSystem, OneForOneStrategy, Props, SupervisorStrategy }
import akka.remote.{ DaemonMsgCreate, RemoteScope }
import akka.routing.{ RoundRobinPool, FromConfig }
import akka.routing.{ FromConfig, RoundRobinPool }
import akka.util.ByteString
import scala.concurrent.duration._
object DaemonMsgCreateSerializerSpec {
class MyActor extends Actor {
def receive = Actor.emptyBehavior
}
class MyActorWithParam(ignore: String) extends Actor {
def receive = Actor.emptyBehavior
}
class MyActorWithFunParam(fun: Function1[Int, Int]) extends Actor {
trait EmptyActor extends Actor {
def receive = Actor.emptyBehavior
}
class MyActor extends EmptyActor
class MyActorWithParam(ignore: String) extends EmptyActor
class MyActorWithFunParam(fun: Function1[Int, Int]) extends EmptyActor
class ActorWithDummyParameter(javaSerialized: DummyParameter, protoSerialized: ActorRef) extends EmptyActor
}
case class DummyParameter(val inner: String) extends Serializable
class DaemonMsgCreateSerializerSpec extends AkkaSpec {
import DaemonMsgCreateSerializerSpec._
@ -79,6 +80,37 @@ class DaemonMsgCreateSerializerSpec extends AkkaSpec {
}
}
"deserialize the old wire format with just class and field for props parameters (if possible)" in {
val serializer = new DaemonMsgCreateSerializer(system.asInstanceOf[ExtendedActorSystem])
// the oldSnapshot was created with the version of DemonMsgCreateSerializer in Akka 2.4.17. See issue #22224.
// It was created with:
/*
import org.apache.commons.codec.binary.Hex.encodeHex
val bytes = serializer.toBinary(
DaemonMsgCreate(Props(classOf[MyActorWithParam], "a string"), Deploy.local, "/user/test", system.actorFor("/user")))
println(String.valueOf(encodeHex(bytes)))
*/
val oldBytesHex =
"0a6a12020a001a48616b6b612e72656d6f74652e73657269616c697a6174696f" +
"6e2e4461656d6f6e4d736743726561746553657269616c697a6572537065632" +
"44d794163746f7257697468506172616d22086120737472696e672a106a6176" +
"612e6c616e672e537472696e67122f0a00222baced000573720016616b6b612" +
"e6163746f722e4c6f63616c53636f706524000000000000000102000078701a" +
"0a2f757365722f74657374222b0a29616b6b613a2f2f4461656d6f6e4d73674" +
"3726561746553657269616c697a6572537065632f75736572"
import org.apache.commons.codec.binary.Hex.decodeHex
val oldBytes = decodeHex(oldBytesHex.toCharArray)
val result = serializer.fromBinary(oldBytes, classOf[DaemonMsgCreate])
result match {
case dmc: DaemonMsgCreate ⇒
dmc.props.args should ===(Seq("a string": Any))
}
}
"serialize and de-serialize DaemonMsgCreate with Deploy and RouterConfig" in {
verifySerialization {
// Duration.Inf doesn't equal Duration.Inf, so we use another for test
@ -105,6 +137,17 @@ class DaemonMsgCreateSerializerSpec extends AkkaSpec {
}
}
"allows for mixing serializers with and without manifests for props parameters" in {
verifySerialization {
DaemonMsgCreate(
// parameters should trigger JavaSerializer for the first one and additional protobuf for the second (?)
props = Props(classOf[ActorWithDummyParameter], new DummyParameter("dummy"), system.deadLetters),
deploy = Deploy(),
path = "foo",
supervisor = supervisor)
}
}
def verifySerialization(msg: DaemonMsgCreate): Unit = {
assertDaemonMsgCreate(msg, ser.deserialize(ser.serialize(msg).get, classOf[DaemonMsgCreate]).get.asInstanceOf[DaemonMsgCreate])
}