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

fix StreamRefs IllegalStateException (#29432)

Browse source 
* Test SinkRefStage in the CumulativeDemand-after-UpstreamFinish scenario
This commit is contained in:
Yufei Cai 2020-08-03 11:16:03 +02:00 • committed by GitHub
parent 68fc503c4c
commit 58fa1e3604
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

35
akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala
View file

@ -433,6 +433,41 @@ class StreamRefsSpec extends AkkaSpec(StreamRefsSpec.config()) {
}
}
"not die to a slow and eager subscriber" in {
import akka.stream.impl.streamref.StreamRefsProtocol._
// GIVEN: remoteActor delivers 2 elements "hello", "world"
val remoteProbe = TestProbe()(remoteSystem)
remoteActor.tell("give", remoteProbe.ref)
val sourceRefImpl = remoteProbe.expectMsgType[SourceRefImpl[String]]
val sourceRefStageProbe = TestProbe("sourceRefStageProbe")
// WHEN: SourceRefStage sends a first CumulativeDemand with enough demand to consume the whole stream
sourceRefStageProbe.send(sourceRefImpl.initialPartnerRef, CumulativeDemand(10))
// THEN: stream established with OnSubscribeHandshake
val onSubscribeHandshake = sourceRefStageProbe.expectMsgType[OnSubscribeHandshake]
val sinkRefStageActorRef = watch(onSubscribeHandshake.targetRef)
// THEN: all elements are streamed to SourceRefStage
sourceRefStageProbe.expectMsg(SequencedOnNext(0, "hello"))
sourceRefStageProbe.expectMsg(SequencedOnNext(1, "world"))
sourceRefStageProbe.expectMsg(RemoteStreamCompleted(2))
// WHEN: SinkRefStage receives another CumulativeDemand, due to latency in network or slowness of sourceRefStage
sourceRefStageProbe.send(sinkRefStageActorRef, CumulativeDemand(10))
// THEN: SinkRefStage should not terminate
expectNoMessage()
// WHEN: SourceRefStage terminates
system.stop(sourceRefStageProbe.ref)
// THEN: SinkRefStage should terminate
expectTerminated(sinkRefStageActorRef)
}
}
"A SinkRef" must {

2
akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala
View file

@ -196,7 +196,7 @@ private[stream] final class SinkRefStageImpl[In] private[akka] (val initialPartn
}
private def tryPull(): Unit =
if (remoteCumulativeDemandConsumed < remoteCumulativeDemandReceived && !hasBeenPulled(in)) {
if (remoteCumulativeDemandConsumed < remoteCumulativeDemandReceived && !hasBeenPulled(in) && !isClosed(in)) {
pull(in)
}