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

Pass HandshakeReq in all inbound lanes, #23527 (#23842)

Browse source 
* Pass HandshakeReq in all inbound lanes, #23527

The HandshakeReq message must be passed in each inbound lane to
ensure that it arrives before any application message. Otherwise there is a risk
that an application message arrives in the InboundHandshake stage before the
handshake is completed and then it would be dropped.

* mima
This commit is contained in:
Patrik Nordwall 2017-11-11 10:19:57 +01:00 • committed by GitHub
parent e7bbbdf8ed
commit 17f712a76b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 211 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

104
akka-remote/src/test/scala/akka/remote/artery/DuplicateHandshakeSpec.scala Normal file
View file

@ -0,0 +1,104 @@
/**
* Copyright (C) 2017 Lightbend Inc. <http://www.lightbend.com>
*/
package akka.remote.artery
import scala.concurrent.duration._
import akka.actor.Address
import akka.actor.ExtendedActorSystem
import akka.remote.UniqueAddress
import akka.remote.artery.OutboundHandshake.HandshakeReq
import akka.stream.ActorMaterializer
import akka.stream.ActorMaterializerSettings
import akka.stream.scaladsl.Keep
import akka.stream.testkit.TestPublisher
import akka.stream.testkit.TestSubscriber
import akka.stream.testkit.scaladsl.TestSink
import akka.stream.testkit.scaladsl.TestSource
import akka.testkit.AkkaSpec
import akka.testkit.ImplicitSender
import akka.util.OptionVal
import akka.serialization.SerializationExtension
import akka.serialization.SerializerWithStringManifest
class DuplicateHandshakeSpec extends AkkaSpec with ImplicitSender {
val matSettings = ActorMaterializerSettings(system).withFuzzing(true)
implicit val mat = ActorMaterializer(matSettings)(system)
val pool = new EnvelopeBufferPool(1034 * 1024, 128)
val serialization = SerializationExtension(system)
val addressA = UniqueAddress(Address("akka", "sysA", "hostA", 1001), 1)
val addressB = UniqueAddress(Address("akka", "sysB", "hostB", 1002), 2)
private def setupStream(inboundContext: InboundContext, timeout: FiniteDuration = 5.seconds): (TestPublisher.Probe[AnyRef], TestSubscriber.Probe[Any]) = {
TestSource.probe[AnyRef]
.map { msg ⇒
val association = inboundContext.association(addressA.uid)
val ser = serialization.serializerFor(msg.getClass)
val serializerId = ser.identifier
val manifest = ser match {
case s: SerializerWithStringManifest ⇒ s.manifest(msg)
case _ ⇒ ""
}
val env = new ReusableInboundEnvelope
env.init(recipient = OptionVal.None, sender = OptionVal.None, originUid = addressA.uid,
serializerId, manifest, flags = 0, envelopeBuffer = null, association, lane = 0)
.withMessage(msg)
env
}
.via(new DuplicateHandshakeReq(numberOfLanes = 3, inboundContext, system.asInstanceOf[ExtendedActorSystem], pool))
.map { case env: InboundEnvelope ⇒ (env.message -> env.lane) }
.toMat(TestSink.probe[Any])(Keep.both)
.run()
}
"DuplicateHandshake stage" must {
"duplicate initial HandshakeReq" in {
val inboundContext = new TestInboundContext(addressB, controlProbe = None)
val (upstream, downstream) = setupStream(inboundContext)
downstream.request(10)
val req = HandshakeReq(addressA, addressB.address)
upstream.sendNext(req)
upstream.sendNext("msg1")
downstream.expectNext((req, 0))
downstream.expectNext((req, 1))
downstream.expectNext((req, 2))
downstream.expectNext(("msg1", 0))
upstream.sendNext(req)
downstream.expectNext((req, 0))
downstream.expectNext((req, 1))
downstream.expectNext((req, 2))
downstream.cancel()
}
"not duplicate after handshake completed" in {
val inboundContext = new TestInboundContext(addressB, controlProbe = None)
val (upstream, downstream) = setupStream(inboundContext)
downstream.request(10)
val req = HandshakeReq(addressA, addressB.address)
upstream.sendNext(req)
downstream.expectNext((req, 0))
downstream.expectNext((req, 1))
downstream.expectNext((req, 2))
upstream.sendNext("msg1")
downstream.expectNext(("msg1", 0))
inboundContext.completeHandshake(addressA)
upstream.sendNext("msg2")
downstream.expectNext(("msg2", 0))
upstream.sendNext(req)
downstream.expectNext((req, 0))
upstream.sendNext("msg3")
downstream.expectNext(("msg3", 0))
downstream.cancel()
}
}
}