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

Merge pull request #18791 from hepin1989/fix-#18135

Browse source 
=str #18135 log debug information when overflowStrategy occur
This commit is contained in:
drewhk 2015-10-27 16:36:46 +01:00
commit fc0ecfebef
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-stream/src/main/scala/akka/stream/impl/AcknowledgePublisher.scala
View file

@ -55,19 +55,25 @@ private[akka] class AcknowledgePublisher(bufferSize: Int, overflowStrategy: Over
enqueueAndSendAck(elem)
else overflowStrategy match {
case DropHead ⇒
log.debug("Dropping the head element because buffer is full and overflowStrategy is: [DropHead]")
buffer.dropHead()
enqueueAndSendAck(elem)
case DropTail ⇒
log.debug("Dropping the tail element because buffer is full and overflowStrategy is: [DropTail]")
buffer.dropTail()
enqueueAndSendAck(elem)
case DropBuffer ⇒
log.debug("Dropping all the buffered elements because buffer is full and overflowStrategy is: [DropBuffer]")
buffer.clear()
enqueueAndSendAck(elem)
case DropNew ⇒
log.debug("Dropping the new element because buffer is full and overflowStrategy is: [DropNew]")
sendAck(false)
case Fail ⇒
log.error("Failing because buffer is full and overflowStrategy is: [Fail]")
onErrorThenStop(new Fail.BufferOverflowException(s"Buffer overflow (max capacity was: $bufferSize)!"))
case Backpressure ⇒
log.debug("Backpressuring because buffer is full and overflowStrategy is: [Backpressure]")
sendAck(false) //does not allow to send more than buffer size
}
}

10
akka-stream/src/main/scala/akka/stream/impl/ActorRefSourceActor.scala
View file

@ -60,20 +60,26 @@ private[akka] class ActorRefSourceActor(bufferSize: Int, overflowStrategy: Overf
buffer.enqueue(elem)
else overflowStrategy match {
case DropHead ⇒
log.debug("Dropping the head element because buffer is full and overflowStrategy is: [DropHead]")
buffer.dropHead()
buffer.enqueue(elem)
case DropTail ⇒
log.debug("Dropping the tail element because buffer is full and overflowStrategy is: [DropTail]")
buffer.dropTail()
buffer.enqueue(elem)
case DropBuffer ⇒
log.debug("Dropping all the buffered elements because buffer is full and overflowStrategy is: [DropBuffer]")
buffer.clear()
buffer.enqueue(elem)
case DropNew ⇒
// do not enqueue new element if the buffer is full
// do not enqueue new element if the buffer is full
log.debug("Dropping the new element because buffer is full and overflowStrategy is: [DropNew]")
case Fail ⇒
log.error("Failing because buffer is full and overflowStrategy is: [Fail]")
onErrorThenStop(new Fail.BufferOverflowException(s"Buffer overflow (max capacity was: $bufferSize)!"))
case Backpressure ⇒
// there is a precondition check in Source.actorRefSource factory method
// there is a precondition check in Source.actorRefSource factory method
log.debug("Backpressuring because buffer is full and overflowStrategy is: [Backpressure]")
}
}