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

increase timeout in MultiDcSplitBrainSpec

Browse source 
* due to handshake timeout

reduce handshake timeout

fourth might generate UnreachableDataCenter in unsplit

MultiDcClusterSharding
This commit is contained in:
Patrik Nordwall 2017-08-28 14:40:56 +02:00
parent dc75c4f818
commit 6bfb7c9262
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala
View file

@ -55,7 +55,9 @@ object MultiDcClusterShardingSpecConfig extends MultiNodeConfig {
val fourth = role("fourth") val fourth = role("fourth")
commonConfig(ConfigFactory.parseString(s""" commonConfig(ConfigFactory.parseString(s"""
akka.loglevel = INFO # DEBUG because of failing test, issue #23582
akka.loglevel = DEBUG
akka.cluster.debug.verbose-heartbeat-logging = on
akka.actor.provider = "cluster" akka.actor.provider = "cluster"
akka.remote.log-remote-lifecycle-events = off akka.remote.log-remote-lifecycle-events = off
akka.cluster.auto-down-unreachable-after = 0s akka.cluster.auto-down-unreachable-after = 0s

9
akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala
View file

@ -20,7 +20,10 @@ object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
commonConfig(ConfigFactory.parseString( commonConfig(ConfigFactory.parseString(
""" """
akka.loglevel = INFO akka.loglevel = DEBUG
akka.cluster.debug.verbose-heartbeat-logging = on
akka.remote.netty.tcp.connection-timeout = 5 s # speedup in case of connection issue
akka.remote.retry-gate-closed-for = 1 s
akka.cluster.multi-data-center { akka.cluster.multi-data-center {
failure-detector { failure-detector {
acceptable-heartbeat-pause = 4s acceptable-heartbeat-pause = 4s
@ -99,7 +102,7 @@ abstract class MultiDcSplitBrainSpec
val memberNodes = (dc1 ++ dc2).filterNot(notMembers) val memberNodes = (dc1 ++ dc2).filterNot(notMembers)
val probe = TestProbe() val probe = TestProbe()
runOn(memberNodes: _*) { runOn(memberNodes: _*) {
cluster.subscribe(probe.ref, classOf[DataCenterReachabilityEvent]) cluster.subscribe(probe.ref, classOf[ReachableDataCenter])
probe.expectMsgType[CurrentClusterState] probe.expectMsgType[CurrentClusterState]
} }
enterBarrier(s"unsplit-$barrierCounter") enterBarrier(s"unsplit-$barrierCounter")
@ -115,7 +118,7 @@ abstract class MultiDcSplitBrainSpec
barrierCounter += 1 barrierCounter += 1
runOn(memberNodes: _*) { runOn(memberNodes: _*) {
probe.expectMsgType[ReachableDataCenter](15.seconds) probe.expectMsgType[ReachableDataCenter](25.seconds)
cluster.unsubscribe(probe.ref) cluster.unsubscribe(probe.ref)
awaitAssert { awaitAssert {
cluster.state.unreachableDataCenters should ===(Set.empty) cluster.state.unreachableDataCenters should ===(Set.empty)