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

Harden and turn on debug logging for SystemMessageDeliverySpec (#23989)

Browse source 
For the failure in #23926 at INFO we get no information about why. This
commit also removes use of deprecated methods in the test.
This commit is contained in:
Christopher Batey 2017-12-04 14:28:06 +00:00 • committed by Arnout Engelen
parent 76b2cfa676
commit 891cf30348
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-remote/src/test/scala/akka/remote/artery/ArteryMultiNodeSpec.scala
View file

@ -3,14 +3,10 @@
*/
package akka.remote.artery
import java.nio.file.{ FileSystems, Files, Path }
import java.util.UUID
import akka.actor.{ ActorSystem, RootActorPath }
import akka.remote.RARP
import akka.testkit.AkkaSpec
import com.typesafe.config.{ Config, ConfigFactory }
import org.scalatest.Outcome
/**
* Base class for remoting tests what needs to test interaction between a "local" actor system
@ -56,5 +52,4 @@ abstract class ArteryMultiNodeSpec(config: Config) extends AkkaSpec(config.withF
remoteSystems = Vector.empty
super.afterTermination()
}
}

29
akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala
View file

@ -22,7 +22,6 @@ import akka.stream.scaladsl.Flow
import akka.stream.scaladsl.Sink
import akka.stream.scaladsl.Source
import akka.stream.testkit.scaladsl.TestSink
import akka.testkit.AkkaSpec
import akka.testkit.ImplicitSender
import akka.testkit.TestActors
import akka.testkit.TestProbe
@ -33,9 +32,14 @@ object SystemMessageDeliverySpec {
case class TestSysMsg(s: String) extends SystemMessageDelivery.AckedDeliveryMessage
val config = ConfigFactory.parseString(
"""
akka.loglevel = DEBUG
""".stripMargin).withFallback(ArterySpecSupport.defaultConfig)
}
class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.defaultConfig) with ImplicitSender {
class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(SystemMessageDeliverySpec.config) with ImplicitSender {
import SystemMessageDeliverySpec._
val addressA = UniqueAddress(
@ -127,7 +131,8 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
watch(remoteRef)
remoteRef ! "hello"
expectMsg("hello")
systemC.terminate()
Await.ready(systemC.terminate(), 10.seconds)
system.log.debug("systemC terminated")
// DeathWatchNotification is sent from systemC, failure detection takes longer than 3 seconds
expectTerminated(remoteRef, 10.seconds)
} finally {
@ -146,7 +151,7 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
.via(drop(dropSeqNumbers = Vector(3L, 4L)))
.via(inbound(inboundContextB))
.map(_.message.asInstanceOf[TestSysMsg])
.runWith(TestSink.probe)
.runWith(TestSink.probe[TestSysMsg])
sink.request(100)
sink.expectNext(TestSysMsg("msg-1"))
@ -155,7 +160,7 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
replyProbe.expectMsg(Ack(2L, addressB))
// 3 and 4 was dropped
replyProbe.expectMsg(Nack(2L, addressB))
sink.expectNoMsg(100.millis) // 3 was dropped
sink.expectNoMessage(100.millis) // 3 was dropped
inboundContextB.deliverLastReply()
// resending 3, 4, 5
sink.expectNext(TestSysMsg("msg-3"))
@ -164,7 +169,7 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
replyProbe.expectMsg(Ack(4L, addressB))
sink.expectNext(TestSysMsg("msg-5"))
replyProbe.expectMsg(Ack(5L, addressB))
replyProbe.expectNoMsg(100.millis)
replyProbe.expectNoMessage(100.millis)
inboundContextB.deliverLastReply()
sink.expectComplete()
}
@ -180,12 +185,12 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
.via(drop(dropSeqNumbers = Vector(1L)))
.via(inbound(inboundContextB))
.map(_.message.asInstanceOf[TestSysMsg])
.runWith(TestSink.probe)
.runWith(TestSink.probe[TestSysMsg])
sink.request(100)
replyProbe.expectMsg(Nack(0L, addressB)) // from receiving 2
replyProbe.expectMsg(Nack(0L, addressB)) // from receiving 3
sink.expectNoMsg(100.millis) // 1 was dropped
sink.expectNoMessage(100.millis) // 1 was dropped
inboundContextB.deliverLastReply() // it's ok to not delivery all nacks
// resending 1, 2, 3
sink.expectNext(TestSysMsg("msg-1"))
@ -209,7 +214,7 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
.via(drop(dropSeqNumbers = Vector(3L)))
.via(inbound(inboundContextB))
.map(_.message.asInstanceOf[TestSysMsg])
.runWith(TestSink.probe)
.runWith(TestSink.probe[TestSysMsg])
sink.request(100)
sink.expectNext(TestSysMsg("msg-1"))
@ -218,14 +223,14 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
sink.expectNext(TestSysMsg("msg-2"))
replyProbe.expectMsg(Ack(2L, addressB))
inboundContextB.deliverLastReply()
sink.expectNoMsg(200.millis) // 3 was dropped
sink.expectNoMessage(200.millis) // 3 was dropped
// resending 3 due to timeout
sink.expectNext(TestSysMsg("msg-3"))
replyProbe.expectMsg(4.seconds, Ack(3L, addressB))
// continue resending
replyProbe.expectMsg(4.seconds, Ack(3L, addressB))
inboundContextB.deliverLastReply()
replyProbe.expectNoMsg(2200.millis)
replyProbe.expectNoMessage(2200.millis)
sink.expectComplete()
}
@ -265,7 +270,5 @@ class SystemMessageDeliverySpec extends ArteryMultiNodeSpec(ArterySpecSupport.de
Await.result(output, 20.seconds) should ===((1 to N).map(n ⇒ TestSysMsg("msg-" + n)).toVector)
}
}
}