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

Proper handoff of readers #3286

Browse source
This commit is contained in:
Endre Sándor Varga 2013-06-03 11:35:37 +02:00
parent fbadb89962
commit 46fb44737c
2 changed files with 88 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

47
akka-remote/src/main/scala/akka/remote/Endpoint.scala
View file

@ -243,7 +243,8 @@ private[remote] class ReliableDeliverySupervisor(
case Terminated(_) ⇒
currentHandle = None
context.become(idle)
case GotUid(u) ⇒ uid = Some(u)
case GotUid(u) ⇒ uid = Some(u)
case s: EndpointWriter.StopReading ⇒ writer forward s
}
def gated: Receive = {
@ -255,7 +256,8 @@ private[remote] class ReliableDeliverySupervisor(
} else context.become(idle)
case s @ Send(msg: SystemMessage, _, _, _) ⇒ tryBuffer(s.copy(seqOpt = Some(nextSeq())))
case s: Send ⇒ context.system.deadLetters ! s
case FlushAndStop ⇒ context.stop(self)
case EndpointWriter.FlushAndStop ⇒ context.stop(self)
case EndpointWriter.StopReading(w) ⇒ sender ! EndpointWriter.StoppedReading(w)
case _ ⇒ // Ignore
}
@ -265,7 +267,8 @@ private[remote] class ReliableDeliverySupervisor(
resendAll()
handleSend(s)
context.become(receive)
case FlushAndStop ⇒ context.stop(self)
case EndpointWriter.FlushAndStop ⇒ context.stop(self)
case EndpointWriter.StopReading(w) ⇒ sender ! EndpointWriter.StoppedReading(w)
}
def flushWait: Receive = {
@ -362,6 +365,8 @@ private[remote] object EndpointWriter {
case object BackoffTimer
case object FlushAndStop
case object AckIdleCheckTimer
case class StopReading(writer: ActorRef)
case class StoppedReading(writer: ActorRef)
case class OutboundAck(ack: Ack)
@ -533,15 +538,23 @@ private[remote] class EndpointWriter(
stash()
stay()
case _: StopReading ⇒
stash()
stay()
}
whenUnhandled {
case Event(Terminated(r), _) if r == reader.orNull ⇒
publishAndThrow(new EndpointDisassociatedException("Disassociated"))
case Event(s: StopReading, _) ⇒
reader match {
case Some(r) ⇒ r forward s
case None ⇒ stash()
}
stay()
case Event(TakeOver(newHandle), _) ⇒
// Shutdown old reader
handle foreach { _.disassociate() }
reader foreach context.stop
handle = Some(newHandle)
goto(Handoff)
case Event(FlushAndStop, _) ⇒
@ -632,7 +645,7 @@ private[remote] class EndpointReader(
val reliableDeliverySupervisor: Option[ActorRef],
val receiveBuffers: ConcurrentHashMap[Link, AckedReceiveBuffer[Message]]) extends EndpointActor(localAddress, remoteAddress, transport, settings, codec) {
import EndpointWriter.OutboundAck
import EndpointWriter.{ OutboundAck, StopReading, StoppedReading }
val provider = RARP(context.system).provider
var ackedReceiveBuffer = new AckedReceiveBuffer[Message]
@ -646,8 +659,9 @@ private[remote] class EndpointReader(
}
}
override def postStop(): Unit = {
override def postStop(): Unit = saveState()
def saveState(): Unit = {
@tailrec
def updateSavedState(key: Link, expectedState: AckedReceiveBuffer[Message]): Unit = {
if (expectedState eq null) {
@ -661,7 +675,8 @@ private[remote] class EndpointReader(
}
override def receive: Receive = {
case Disassociated ⇒ context.stop(self)
case Disassociated ⇒
context.stop(self)
case InboundPayload(p) if p.size <= transport.maximumPayloadBytes ⇒
val (ackOption, msgOption) = tryDecodeMessageAndAck(p)
@ -682,6 +697,24 @@ private[remote] class EndpointReader(
publishError(new OversizedPayloadException(s"Discarding oversized payload received: " +
s"max allowed size [${transport.maximumPayloadBytes}] bytes, actual size [${oversized.size}] bytes."))
case StopReading(writer) ⇒
saveState()
context.become(notReading)
sender ! StoppedReading(writer)
}
def notReading: Receive = {
case Disassociated ⇒ context.stop(self)
case StopReading(newHandle) ⇒
sender ! StoppedReading(newHandle)
case InboundPayload(p) ⇒
val (ackOption, _) = tryDecodeMessageAndAck(p)
for (ack ← ackOption; reliableDelivery ← reliableDeliverySupervisor) reliableDelivery ! ack
case _ ⇒
}
private def deliverAndAck(): Unit = {