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

Increase timeout and remove sleep

Browse source 
The test has been failing infrequently as when we get to the final
barrier (restarted-fifth-removed) the whole test withIn of 40s
has been reached so the last barrier times out right away.

Trying to remove the Thread.sleep and rely on a larger timeout for the
whole test as well as the default barrier timeout of 30s.
This commit is contained in:
Christopher Batey 2017-10-31 10:07:24 +00:00
parent c05a3e0e26
commit 4d3a7e93a6
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
*/ */
package akka.cluster package akka.cluster
import akka.actor.ActorSystem
import akka.cluster.ClusterEvent._ import akka.cluster.ClusterEvent._
import akka.remote.testconductor.RoleName import akka.remote.testconductor.RoleName
import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec }
@ -10,13 +11,8 @@ import akka.remote.transport.ThrottlerTransportAdapter.Direction
import akka.testkit.TestProbe import akka.testkit.TestProbe
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
import scala.concurrent.duration._
import akka.actor.ActorSystem
import akka.actor.Props
import akka.actor.Actor
import akka.actor.Deploy
import akka.actor.RootActorPath
import scala.concurrent.Await import scala.concurrent.Await
import scala.concurrent.duration._
object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig { object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
val first = role("first") val first = role("first")
@ -196,7 +192,7 @@ abstract class MultiDcSplitBrainSpec
enterBarrier("inter-data-center-split-2-done") enterBarrier("inter-data-center-split-2-done")
} }
"be able to have data center member restart (same host:port) while there is inter data center split" in within(40.seconds) { "be able to have data center member restart (same host:port) while there is inter data center split" in within(60.seconds) {
val subscribeProbe = TestProbe() val subscribeProbe = TestProbe()
runOn(first, second, third, fifth) { runOn(first, second, third, fifth) {
Cluster(system).subscribe(subscribeProbe.ref, InitialStateAsSnapshot, classOf[MemberUp], classOf[MemberRemoved]) Cluster(system).subscribe(subscribeProbe.ref, InitialStateAsSnapshot, classOf[MemberUp], classOf[MemberRemoved])
@ -265,7 +261,8 @@ abstract class MultiDcSplitBrainSpec
runOn(first, second, third) { runOn(first, second, third) {
awaitAssert(clusterView.members.collectFirst { awaitAssert(clusterView.members.collectFirst {
case m if m.dataCenter == "dc2" && m.address == fifthOriginalUniqueAddress.get.address ⇒ m.uniqueAddress case m if m.dataCenter == "dc2" && m.address == fifthOriginalUniqueAddress.get.address ⇒ m.uniqueAddress
} should not be (fifthOriginalUniqueAddress)) // different uid } should not be fifthOriginalUniqueAddress) // different uid
subscribeProbe.expectMsgType[MemberUp].member.uniqueAddress should ===(fifthOriginalUniqueAddress.get) subscribeProbe.expectMsgType[MemberUp].member.uniqueAddress should ===(fifthOriginalUniqueAddress.get)
subscribeProbe.expectMsgType[MemberRemoved].member.uniqueAddress should ===(fifthOriginalUniqueAddress.get) subscribeProbe.expectMsgType[MemberRemoved].member.uniqueAddress should ===(fifthOriginalUniqueAddress.get)
subscribeProbe.expectMsgType[MemberUp].member.address should ===(fifthOriginalUniqueAddress.get.address) subscribeProbe.expectMsgType[MemberUp].member.address should ===(fifthOriginalUniqueAddress.get.address)
@ -278,14 +275,13 @@ abstract class MultiDcSplitBrainSpec
Cluster(system).leave(fifthOriginalUniqueAddress.get.address) Cluster(system).leave(fifthOriginalUniqueAddress.get.address)
} }
runOn(first, second, third) { runOn(first, second, third) {
awaitAssert(clusterView.members.map(_.address) should ===(Set(address(first), address(second), address(third)))) awaitAssert({
clusterView.members.map(_.address) should ===(Set(address(first), address(second), address(third)))
})
} }
runOn(remainingRoles: _*) { runOn(remainingRoles: _*) {
Thread.sleep(5000) // FIXME remove
enterBarrier("restarted-fifth-removed") enterBarrier("restarted-fifth-removed")
} }
} }
} }
} }