diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala new file mode 100644 index 0000000000..9ed003944f --- /dev/null +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala @@ -0,0 +1,101 @@ +/** + * Copyright (C) 2009-2012 Typesafe Inc. + */ + +package akka.cluster + +import org.scalatest.BeforeAndAfter +import com.typesafe.config.ConfigFactory +import akka.remote.testkit.MultiNodeConfig +import akka.remote.testkit.MultiNodeSpec +import akka.testkit.ImplicitSender + +object JoinTwoClustersMultiJvmSpec extends MultiNodeConfig { + val a1 = role("a1") + val a2 = role("a2") + val b1 = role("b1") + val b2 = role("b2") + val c1 = role("c1") + val c2 = role("c2") + + commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(""" + akka.cluster { + gossip-frequency = 200 ms + leader-actions-frequency = 200 ms + periodic-tasks-initial-delay = 300 ms + } + """))) + +} + +class JoinTwoClustersMultiJvmNode1 extends JoinTwoClustersSpec +class JoinTwoClustersMultiJvmNode2 extends JoinTwoClustersSpec +class JoinTwoClustersMultiJvmNode3 extends JoinTwoClustersSpec +class JoinTwoClustersMultiJvmNode4 extends JoinTwoClustersSpec +class JoinTwoClustersMultiJvmNode5 extends JoinTwoClustersSpec +class JoinTwoClustersMultiJvmNode6 extends JoinTwoClustersSpec + +abstract class JoinTwoClustersSpec extends MultiNodeSpec(JoinTwoClustersMultiJvmSpec) with ImplicitSender with BeforeAndAfter { + import JoinTwoClustersMultiJvmSpec._ + + override def initialParticipants = 6 + + def cluster: Cluster = Cluster(system) + + after { + testConductor.enter("after") + } + + val a1Address = node(a1).address + val b1Address = node(b1).address + val c1Address = node(c1).address + + def awaitUpConvergence(numberOfMembers: Int): Unit = { + awaitCond(cluster.latestGossip.members.size == numberOfMembers) + awaitCond(cluster.latestGossip.members.forall(_.status == MemberStatus.Up)) + awaitCond(cluster.convergence.isDefined) + } + + "Three different clusters (A, B and C)" must { + + "be able to 'elect' a single leader after joining (A -> B)" in { + + runOn(a1, a2) { + cluster.join(a1Address) + } + runOn(b1, b2) { + cluster.join(b1Address) + } + runOn(c1, c2) { + cluster.join(c1Address) + } + + awaitUpConvergence(numberOfMembers = 2) + + cluster.isLeader must be(ifNode(a1, b1, c1)(true)(false)) + + runOn(b2) { + cluster.join(a1Address) + } + + runOn(a1, a2, b1, b2) { + awaitUpConvergence(numberOfMembers = 4) + } + + cluster.isLeader must be(ifNode(a1, c1)(true)(false)) + + } + + "be able to 'elect' a single leader after joining (C -> A + B)" in { + + runOn(b2) { + cluster.join(c1Address) + } + + awaitUpConvergence(numberOfMembers = 6) + + cluster.isLeader must be(ifNode(a1)(true)(false)) + } + } + +} diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinTwoClustersSpec.scala b/akka-cluster/src/test/scala/akka/cluster/JoinTwoClustersSpec.scala deleted file mode 100644 index ff12cb6c60..0000000000 --- a/akka-cluster/src/test/scala/akka/cluster/JoinTwoClustersSpec.scala +++ /dev/null @@ -1,179 +0,0 @@ -/** - * Copyright (C) 2009-2012 Typesafe Inc. - */ - -package akka.cluster - -import akka.testkit._ -import akka.dispatch._ -import akka.actor._ -import akka.remote._ -import akka.util.duration._ - -import com.typesafe.config._ - -import java.net.InetSocketAddress - -class JoinTwoClustersSpec extends ClusterSpec("akka.cluster.failure-detector.threshold = 5") with ImplicitSender { - val portPrefix = 3 - - var node1: Cluster = _ - var node2: Cluster = _ - var node3: Cluster = _ - var node4: Cluster = _ - var node5: Cluster = _ - var node6: Cluster = _ - - var system1: ActorSystemImpl = _ - var system2: ActorSystemImpl = _ - var system3: ActorSystemImpl = _ - var system4: ActorSystemImpl = _ - var system5: ActorSystemImpl = _ - var system6: ActorSystemImpl = _ - - try { - "Three different clusters (A, B and C)" must { - - // ======= NODE 1 ======== - system1 = ActorSystem("system1", ConfigFactory - .parseString(""" - akka { - actor.provider = "akka.remote.RemoteActorRefProvider" - remote.netty.port = %d551 - }""".format(portPrefix)) - .withFallback(system.settings.config)) - .asInstanceOf[ActorSystemImpl] - node1 = Cluster(system1) - - // ======= NODE 2 ======== - system2 = ActorSystem("system2", ConfigFactory - .parseString(""" - akka { - actor.provider = "akka.remote.RemoteActorRefProvider" - remote.netty.port = %d552 - cluster.node-to-join = "akka://system1@localhost:%d551" - }""".format(portPrefix, portPrefix)) - .withFallback(system.settings.config)) - .asInstanceOf[ActorSystemImpl] - node2 = Cluster(system2) - - // ======= NODE 3 ======== - system3 = ActorSystem("system3", ConfigFactory - .parseString(""" - akka { - actor.provider = "akka.remote.RemoteActorRefProvider" - remote.netty.port = %d553 - }""".format(portPrefix)) - .withFallback(system.settings.config)) - .asInstanceOf[ActorSystemImpl] - node3 = Cluster(system3) - - // ======= NODE 4 ======== - system4 = ActorSystem("system4", ConfigFactory - .parseString(""" - akka { - actor.provider = "akka.remote.RemoteActorRefProvider" - remote.netty.port = %d554 - cluster.node-to-join = "akka://system3@localhost:%d553" - }""".format(portPrefix, portPrefix)) - .withFallback(system.settings.config)) - .asInstanceOf[ActorSystemImpl] - node4 = Cluster(system4) - - // ======= NODE 5 ======== - system5 = ActorSystem("system5", ConfigFactory - .parseString(""" - akka { - actor.provider = "akka.remote.RemoteActorRefProvider" - remote.netty.port = %d555 - }""".format(portPrefix)) - .withFallback(system.settings.config)) - .asInstanceOf[ActorSystemImpl] - node5 = Cluster(system5) - - // ======= NODE 6 ======== - system6 = ActorSystem("system6", ConfigFactory - .parseString(""" - akka { - actor.provider = "akka.remote.RemoteActorRefProvider" - remote.netty.port = %d556 - cluster.node-to-join = "akka://system5@localhost:%d555" - }""".format(portPrefix, portPrefix)) - .withFallback(system.settings.config)) - .asInstanceOf[ActorSystemImpl] - node6 = Cluster(system6) - - "be able to 'elect' a single leader after joining (A -> B)" taggedAs LongRunningTest in { - - println("Give the system time to converge...") - awaitConvergence(node1 :: node2 :: node3 :: node4 :: node5 :: node6 :: Nil) - - // check leader - node1.isLeader must be(true) - node2.isLeader must be(false) - node3.isLeader must be(true) - node4.isLeader must be(false) - node5.isLeader must be(true) - node6.isLeader must be(false) - - // join - node4.join(node1.remoteAddress) - //node1.scheduleNodeJoin(node4.remoteAddress) - - println("Give the system time to converge...") - Thread.sleep(10.seconds.dilated.toMillis) - awaitConvergence(node1 :: node2 :: node3 :: node4 :: node5 :: node6 :: Nil) - - // check leader - node1.isLeader must be(true) - node2.isLeader must be(false) - node3.isLeader must be(false) - node4.isLeader must be(false) - node5.isLeader must be(true) - node6.isLeader must be(false) - } - - "be able to 'elect' a single leader after joining (C -> A + B)" taggedAs LongRunningTest in { - // join - node4.join(node5.remoteAddress) - //node5.scheduleNodeJoin(node4.remoteAddress) - - println("Give the system time to converge...") - Thread.sleep(10.seconds.dilated.toMillis) - awaitConvergence(node1 :: node2 :: node3 :: node4 :: node5 :: node6 :: Nil) - - // check leader - node1.isLeader must be(true) - node2.isLeader must be(false) - node3.isLeader must be(false) - node4.isLeader must be(false) - node5.isLeader must be(false) - node6.isLeader must be(false) - } - } - } catch { - case e: Exception ⇒ - e.printStackTrace - fail(e.toString) - } - - override def atTermination() { - if (node1 ne null) node1.shutdown() - if (system1 ne null) system1.shutdown() - - if (node2 ne null) node2.shutdown() - if (system2 ne null) system2.shutdown() - - if (node3 ne null) node3.shutdown() - if (system3 ne null) system3.shutdown() - - if (node4 ne null) node4.shutdown() - if (system4 ne null) system4.shutdown() - - if (node5 ne null) node5.shutdown() - if (system5 ne null) system5.shutdown() - - if (node6 ne null) node6.shutdown() - if (system6 ne null) system6.shutdown() - } -}