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

Artery test transport blackhole only let HandshakeReq pass (#30219)

Browse source 
* only let HandshakeReq is blackholed
This commit is contained in:
Renato Cavalcanti 2021-06-02 08:41:39 +02:00 • committed by GitHub
parent 5abc119577
commit 3dd0c4c86b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
akka-remote/src/main/scala/akka/remote/artery/TestStage.scala
View file

@ -5,11 +5,10 @@
package akka.remote.artery package akka.remote.artery
import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.atomic.AtomicReference
import scala.annotation.tailrec import scala.annotation.tailrec
import akka.actor.Address import akka.actor.Address
import akka.event.Logging import akka.event.Logging
import akka.remote.artery.OutboundHandshake.HandshakeReq
import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.remote.transport.ThrottlerTransportAdapter.Direction
import akka.stream.Attributes import akka.stream.Attributes
import akka.stream.FlowShape import akka.stream.FlowShape
@ -173,11 +172,24 @@ private[remote] class InboundTestStage(inboundContext: InboundContext, state: Sh
push(out, env) push(out, env)
case _ => case _ =>
// unknown, handshake not completed // unknown, handshake not completed
if (state.anyBlackholePresent()) if (state.anyBlackholePresent()) {
log.debug( env.message match {
"inbound message [{}] before handshake completed, cannot check if remote is blackholed, letting through", case _: HandshakeReq =>
Logging.messageClassName(env.message)) log.debug(
push(out, env) "inbound message [{}] before handshake completed, cannot check if remote is blackholed, letting through",
Logging.messageClassName(env.message))
push(out, env) // let it through
case anyOther =>
log.debug(
"dropping inbound message [{}] with UID [{}] because of blackhole",
Logging.messageClassName(anyOther),
env.originUid)
pull(in) // drop message
}
} else {
push(out, env)
}
} }
} }
} }