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

fix byte order issue in DaemonMsgCreateSerializer, #22366

Browse source 
* We used the Array based toBinary but the ByteBuffer based fromBinary.
  and IntSerializer is only using the same format for those when the byte order
  is  LITTLE_ENDIAN, which we didn't get from protbuf's asReadOnlyByteBuffer
* We can use the Array based methods in DaemonMsgCreateSerializer,
  performance is not important here
* Added some more testing in PrimitivesSerializationSpec
This commit is contained in:
Patrik Nordwall 2017-02-22 13:41:24 +01:00
parent 94afbee179
commit 20e43ccd40
2 changed files with 35 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala
View file

@ -110,10 +110,10 @@ private[akka] final class DaemonMsgCreateSerializer(val system: ExtendedActorSys
val manifest =
if (protoProps.getHasManifest(idx)) protoProps.getManifests(idx)
else ""
serialization.deserializeByteBuffer(
protoProps.getArgs(idx).asReadOnlyByteBuffer(),
serialization.deserialize(
protoProps.getArgs(idx).toByteArray(),
protoProps.getSerializerIds(idx),
manifest)
manifest).get
}
} else {
// message from an older node, which only provides data and class name

82
akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala
View file

@ -12,6 +12,10 @@ import akka.util.ByteString
import com.typesafe.config.ConfigFactory
import scala.util.Random
import java.nio.ByteOrder
import akka.serialization.Serialization
import akka.serialization.ByteBufferSerializer
import akka.serialization.Serializer
object PrimitivesSerializationSpec {
val serializationTestOverrides =
@ -23,7 +27,34 @@ object PrimitivesSerializationSpec {
class PrimitivesSerializationSpec extends AkkaSpec(PrimitivesSerializationSpec.testConfig) {
val buffer = ByteBuffer.allocate(1024)
val buffer = {
val b = ByteBuffer.allocate(1024)
b.order(ByteOrder.LITTLE_ENDIAN)
b
}
val serialization = SerializationExtension(system)
def verifySerialization(msg: AnyRef): Unit = {
val serializer = serialization.serializerFor(msg.getClass)
serializer.fromBinary(serializer.toBinary(msg), None) should ===(msg)
}
def verifySerializationByteBuffer(msg: AnyRef): Unit = {
val serializer = serialization.serializerFor(msg.getClass).asInstanceOf[Serializer with ByteBufferSerializer]
buffer.clear()
serializer.toBinary(msg, buffer)
buffer.flip()
// also make sure that the Array and ByteBuffer formats are equal, given LITTLE_ENDIAN
val array1 = Array.ofDim[Byte](buffer.remaining())
buffer.get(array1)
val array2 = serializer.toBinary(msg)
ByteString(array1) should ===(ByteString(array2))
buffer.rewind()
serializer.fromBinary(buffer, "") should ===(msg)
}
"LongSerializer" must {
Seq(0L, 1L, -1L, Long.MinValue, Long.MinValue + 1L, Long.MaxValue, Long.MaxValue - 1L).map(_.asInstanceOf[AnyRef]).foreach {
@ -42,18 +73,6 @@ class PrimitivesSerializationSpec extends AkkaSpec(PrimitivesSerializationSpec.t
}
}
def verifySerialization(msg: AnyRef): Unit = {
val serializer = new LongSerializer(system.asInstanceOf[ExtendedActorSystem])
serializer.fromBinary(serializer.toBinary(msg), None) should ===(msg)
}
def verifySerializationByteBuffer(msg: AnyRef): Unit = {
val serializer = new LongSerializer(system.asInstanceOf[ExtendedActorSystem])
buffer.clear()
serializer.toBinary(msg, buffer)
buffer.flip()
serializer.fromBinary(buffer, "") should ===(msg)
}
}
"IntSerializer" must {
@ -72,19 +91,6 @@ class PrimitivesSerializationSpec extends AkkaSpec(PrimitivesSerializationSpec.t
verifySerializationByteBuffer(item)
}
}
def verifySerialization(msg: AnyRef): Unit = {
val serializer = new IntSerializer(system.asInstanceOf[ExtendedActorSystem])
serializer.fromBinary(serializer.toBinary(msg), None) should ===(msg)
}
def verifySerializationByteBuffer(msg: AnyRef): Unit = {
val serializer = new IntSerializer(system.asInstanceOf[ExtendedActorSystem])
buffer.clear()
serializer.toBinary(msg, buffer)
buffer.flip()
serializer.fromBinary(buffer, "") should ===(msg)
}
}
"StringSerializer" must {
@ -109,18 +115,6 @@ class PrimitivesSerializationSpec extends AkkaSpec(PrimitivesSerializationSpec.t
}
}
def verifySerialization(msg: AnyRef): Unit = {
val serializer = new StringSerializer(system.asInstanceOf[ExtendedActorSystem])
serializer.fromBinary(serializer.toBinary(msg), None) should ===(msg)
}
def verifySerializationByteBuffer(msg: AnyRef): Unit = {
val serializer = new StringSerializer(system.asInstanceOf[ExtendedActorSystem])
buffer.clear()
serializer.toBinary(msg, buffer)
buffer.flip()
serializer.fromBinary(buffer, "") should ===(msg)
}
}
"ByteStringSerializer" must {
@ -144,18 +138,6 @@ class PrimitivesSerializationSpec extends AkkaSpec(PrimitivesSerializationSpec.t
}
}
def verifySerialization(msg: AnyRef): Unit = {
val serializer = new ByteStringSerializer(system.asInstanceOf[ExtendedActorSystem])
serializer.fromBinary(serializer.toBinary(msg), None) should ===(msg)
}
def verifySerializationByteBuffer(msg: AnyRef): Unit = {
val serializer = new ByteStringSerializer(system.asInstanceOf[ExtendedActorSystem])
buffer.clear()
serializer.toBinary(msg, buffer)
buffer.flip()
serializer.fromBinary(buffer, "") should ===(msg)
}
}
}