From 392c060530fa19786d4c7807babda80c534779fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Mon, 5 Dec 2011 11:16:29 +0100 Subject: [PATCH 1/4] Simplified multi-jvm test by adding all settings and config into the test source itself --- .../scala/akka/remote/AkkaRemoteSpec.scala | 2 +- .../DirectRoutedRemoteActorMultiJvmSpec.scala | 41 ++++-- .../remote/GossipMembershipMultiJvmSpec.scala | 134 ++++++++++++++++++ .../remote/NewRemoteActorMultiJvmSpec.scala | 82 +++++++++++ .../RandomRoutedRemoteActorMultiJvmSpec.scala | 49 ++++++- ...ndRobinRoutedRemoteActorMultiJvmSpec.scala | 49 ++++++- ...rGatherRoutedRemoteActorMultiJvmSpec.scala | 49 ++++++- .../DirectRoutedRemoteActorMultiJvmNode1.conf | 11 -- .../DirectRoutedRemoteActorMultiJvmNode1.opts | 1 - .../DirectRoutedRemoteActorMultiJvmNode2.conf | 11 -- .../DirectRoutedRemoteActorMultiJvmNode2.opts | 1 - .../NewRemoteActorMultiJvmNode1.conf | 9 -- .../NewRemoteActorMultiJvmNode1.opts | 1 - .../NewRemoteActorMultiJvmNode2.conf | 9 -- .../NewRemoteActorMultiJvmNode2.opts | 1 - .../NewRemoteActorMultiJvmSpec.scala | 57 -------- .../RandomRoutedRemoteActorMultiJvmNode1.conf | 11 -- .../RandomRoutedRemoteActorMultiJvmNode1.opts | 1 - .../RandomRoutedRemoteActorMultiJvmNode2.conf | 9 -- .../RandomRoutedRemoteActorMultiJvmNode2.opts | 1 - .../RandomRoutedRemoteActorMultiJvmNode3.conf | 11 -- .../RandomRoutedRemoteActorMultiJvmNode3.opts | 1 - .../RandomRoutedRemoteActorMultiJvmNode4.conf | 11 -- .../RandomRoutedRemoteActorMultiJvmNode4.opts | 1 - ...ndRobinRoutedRemoteActorMultiJvmNode1.conf | 11 -- ...ndRobinRoutedRemoteActorMultiJvmNode1.opts | 1 - ...ndRobinRoutedRemoteActorMultiJvmNode2.conf | 11 -- ...ndRobinRoutedRemoteActorMultiJvmNode2.opts | 1 - ...ndRobinRoutedRemoteActorMultiJvmNode3.conf | 11 -- ...ndRobinRoutedRemoteActorMultiJvmNode3.opts | 1 - ...ndRobinRoutedRemoteActorMultiJvmNode4.conf | 11 -- ...ndRobinRoutedRemoteActorMultiJvmNode4.opts | 1 - ...rGatherRoutedRemoteActorMultiJvmNode1.conf | 11 -- ...rGatherRoutedRemoteActorMultiJvmNode1.opts | 1 - ...rGatherRoutedRemoteActorMultiJvmNode2.conf | 11 -- ...rGatherRoutedRemoteActorMultiJvmNode2.opts | 1 - ...rGatherRoutedRemoteActorMultiJvmNode3.conf | 11 -- ...rGatherRoutedRemoteActorMultiJvmNode3.opts | 1 - ...rGatherRoutedRemoteActorMultiJvmNode4.conf | 11 -- ...rGatherRoutedRemoteActorMultiJvmNode4.opts | 1 - 40 files changed, 379 insertions(+), 270 deletions(-) rename akka-remote/src/multi-jvm/scala/akka/remote/{direct_routed => }/DirectRoutedRemoteActorMultiJvmSpec.scala (56%) create mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala create mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala rename akka-remote/src/multi-jvm/scala/akka/remote/{random_routed => }/RandomRoutedRemoteActorMultiJvmSpec.scala (63%) rename akka-remote/src/multi-jvm/scala/akka/remote/{round_robin_routed => }/RoundRobinRoutedRemoteActorMultiJvmSpec.scala (62%) rename akka-remote/src/multi-jvm/scala/akka/remote/{scatter_gather_routed => }/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala (63%) delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmSpec.scala delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.opts delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.conf delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.opts diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala index 01cc597d49..58679eaccd 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala @@ -26,7 +26,7 @@ object AkkaRemoteSpec { } } -abstract class AkkaRemoteSpec extends AkkaSpec(AkkaRemoteSpec.testConf) with MultiJvmSync { +abstract class AkkaRemoteSpec(config: Config = AkkaRemoteSpec.testConf) extends AkkaSpec(config) with MultiJvmSync { /** * Helper function for accessing the underlying remoting. diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala similarity index 56% rename from akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmSpec.scala rename to akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala index f1a6745d91..50043f80c1 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala @@ -1,4 +1,4 @@ -package akka.remote.direct_routed +package akka.remote import akka.remote._ import akka.routing._ @@ -13,38 +13,57 @@ object DirectRoutedRemoteActorMultiJvmSpec { case "identify" ⇒ sender ! system.nodename } } + + import com.typesafe.config.ConfigFactory + val commonConfig = ConfigFactory.parseString(""" + akka { + loglevel = "WARNING" + actor { + provider = "akka.remote.RemoteActorRefProvider" + deployment { + /app/service-hello.router = "direct" + /app/service-hello.nr-of-instances = 1 + /app/service-hello.remote.nodes = ["localhost:9991"] + } + } + remote.server.hostname = "localhost" + }""") + + val node1Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9991" + cluster.nodename = "node1" + }""") withFallback commonConfig + + val node2Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9992" + cluster.nodename = "node2" + }""") withFallback commonConfig } -class DirectRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { - +class DirectRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(DirectRoutedRemoteActorMultiJvmSpec.node1Config) { import DirectRoutedRemoteActorMultiJvmSpec._ - val nodes = NrOfNodes "___" must { "___" in { barrier("setup") - remote.start() - barrier("start") barrier("done") } } } -class DirectRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { - +class DirectRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(DirectRoutedRemoteActorMultiJvmSpec.node2Config) { import DirectRoutedRemoteActorMultiJvmSpec._ - val nodes = NrOfNodes "A new remote actor configured with a Direct router" must { "be locally instantiated on a remote node and be able to communicate through its RemoteActorRef" in { barrier("setup") - remote.start() - barrier("start") val actor = system.actorOf[SomeActor]("service-hello") diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala new file mode 100644 index 0000000000..878b7840b0 --- /dev/null +++ b/akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala @@ -0,0 +1,134 @@ +// package akka.remote + +// import akka.actor.Actor +// import akka.remote._ +// import akka.routing._ +// import akka.routing.Routing.Broadcast + +// object GossipMembershipMultiJvmSpec { +// val NrOfNodes = 4 +// class SomeActor extends Actor with Serializable { +// def receive = { +// case "hit" ⇒ sender ! system.nodename +// case "end" ⇒ self.stop() +// } +// } + +// import com.typesafe.config.ConfigFactory +// val commonConfig = ConfigFactory.parseString(""" +// akka { +// loglevel = "WARNING" +// cluster { +// seed-nodes = ["localhost:9991"] +// } +// remote.server.hostname = "localhost" +// }""") + +// val node1Config = ConfigFactory.parseString(""" +// akka { +// remote.server.port = "9991" +// cluster.nodename = "node1" +// }""") withFallback commonConfig + +// val node2Config = ConfigFactory.parseString(""" +// akka { +// remote.server.port = "9992" +// cluster.nodename = "node2" +// }""") withFallback commonConfig + +// val node3Config = ConfigFactory.parseString(""" +// akka { +// remote.server.port = "9993" +// cluster.nodename = "node3" +// }""") withFallback commonConfig + +// val node4Config = ConfigFactory.parseString(""" +// akka { +// remote.server.port = "9994" +// cluster.nodename = "node4" +// }""") withFallback commonConfig +// } + +// class GossipMembershipMultiJvmNode1 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node1Config) { +// import GossipMembershipMultiJvmSpec._ +// val nodes = NrOfNodes +// "A cluster" must { +// "allow new node to join and should reach convergence with new membership table" in { + +// barrier("setup") +// remote.start() + +// barrier("start") +// val actor = system.actorOf[SomeActor]("service-hello") +// actor.isInstanceOf[RoutedActorRef] must be(true) + +// val connectionCount = NrOfNodes - 1 +// val iterationCount = 10 + +// var replies = Map( +// "node1" -> 0, +// "node2" -> 0, +// "node3" -> 0) + +// for (i ← 0 until iterationCount) { +// for (k ← 0 until connectionCount) { +// val nodeName = (actor ? "hit").as[String].getOrElse(fail("No id returned by actor")) +// replies = replies + (nodeName -> (replies(nodeName) + 1)) +// } +// } + +// barrier("broadcast-end") +// actor ! Broadcast("end") + +// barrier("end") +// replies.values foreach { _ must be > (0) } + +// barrier("done") +// } +// } +// } + +// class GossipMembershipMultiJvmNode2 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node2Config) { +// import GossipMembershipMultiJvmSpec._ +// val nodes = NrOfNodes +// "___" must { +// "___" in { +// barrier("setup") +// remote.start() +// barrier("start") +// barrier("broadcast-end") +// barrier("end") +// barrier("done") +// } +// } +// } + +// class GossipMembershipMultiJvmNode3 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node3Config) { +// import GossipMembershipMultiJvmSpec._ +// val nodes = NrOfNodes +// "___" must { +// "___" in { +// barrier("setup") +// remote.start() +// barrier("start") +// barrier("broadcast-end") +// barrier("end") +// barrier("done") +// } +// } +// } + +// class GossipMembershipMultiJvmNode4 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node4Config) { +// import GossipMembershipMultiJvmSpec._ +// val nodes = NrOfNodes +// "___" must { +// "___" in { +// barrier("setup") +// remote.start() +// barrier("start") +// barrier("broadcast-end") +// barrier("end") +// barrier("done") +// } +// } +// } diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala new file mode 100644 index 0000000000..f179e36d3a --- /dev/null +++ b/akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala @@ -0,0 +1,82 @@ +package akka.remote + +import akka.actor.Actor +import akka.remote._ + +object NewRemoteActorMultiJvmSpec { + val NrOfNodes = 2 + + class SomeActor extends Actor with Serializable { + def receive = { + case "identify" ⇒ sender ! system.nodename + } + } + + import com.typesafe.config.ConfigFactory + val commonConfig = ConfigFactory.parseString(""" + akka { + loglevel = "WARNING" + actor { + provider = "akka.remote.RemoteActorRefProvider" + deployment { + /app/service-hello.remote.nodes = ["localhost:9991"] + } + } + remote.server.hostname = "localhost" + }""") + + val node1Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9991" + cluster.nodename = "node1" + }""") withFallback commonConfig + + val node2Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9992" + cluster.nodename = "node2" + }""") withFallback commonConfig +} + +class NewRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(NewRemoteActorMultiJvmSpec.node1Config) { + + import NewRemoteActorMultiJvmSpec._ + + val nodes = NrOfNodes + + "___" must { + "___" in { + barrier("setup") + + remote.start() + + barrier("start") + + barrier("done") + } + } +} + +class NewRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(NewRemoteActorMultiJvmSpec.node2Config) { + + import NewRemoteActorMultiJvmSpec._ + + val nodes = NrOfNodes + + "A new remote actor" must { + "be locally instantiated on a remote node and be able to communicate through its RemoteActorRef" in { + barrier("setup") + + remote.start() + + barrier("start") + + val actor = system.actorOf[SomeActor]("service-hello") + val result = (actor ? "identify").get + result must equal("node1") + + barrier("done") + } + } +} + diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala similarity index 63% rename from akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmSpec.scala rename to akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala index a5701cccd4..786d2f6d27 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala @@ -1,4 +1,4 @@ -package akka.remote.random_routed +package akka.remote import akka.actor.Actor import akka.remote._ @@ -13,9 +13,48 @@ object RandomRoutedRemoteActorMultiJvmSpec { case "end" ⇒ self.stop() } } + + import com.typesafe.config.ConfigFactory + val commonConfig = ConfigFactory.parseString(""" + akka { + loglevel = "WARNING" + actor { + provider = "akka.remote.RemoteActorRefProvider" + deployment { + /app/service-hello.router = "random" + /app/service-hello.nr-of-instances = 3 + /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] + } + } + remote.server.hostname = "localhost" + }""") + + val node1Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9991" + cluster.nodename = "node1" + }""") withFallback commonConfig + + val node2Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9992" + cluster.nodename = "node2" + }""") withFallback commonConfig + + val node3Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9993" + cluster.nodename = "node3" + }""") withFallback commonConfig + + val node4Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9994" + cluster.nodename = "node4" + }""") withFallback commonConfig } -class RandomRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { +class RandomRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(RandomRoutedRemoteActorMultiJvmSpec.node1Config) { import RandomRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -30,7 +69,7 @@ class RandomRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { } } -class RandomRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { +class RandomRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(RandomRoutedRemoteActorMultiJvmSpec.node2Config) { import RandomRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -45,7 +84,7 @@ class RandomRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { } } -class RandomRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec { +class RandomRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec(RandomRoutedRemoteActorMultiJvmSpec.node3Config) { import RandomRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -60,7 +99,7 @@ class RandomRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec { } } -class RandomRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec { +class RandomRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec(RandomRoutedRemoteActorMultiJvmSpec.node4Config) { import RandomRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "A new remote actor configured with a Random router" must { diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala similarity index 62% rename from akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmSpec.scala rename to akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala index 413d7814a5..fa0d30bf86 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala @@ -1,4 +1,4 @@ -package akka.remote.round_robin_routed +package akka.remote import akka.actor.Actor import akka.remote._ @@ -13,9 +13,48 @@ object RoundRobinRoutedRemoteActorMultiJvmSpec { case "end" ⇒ self.stop() } } + + import com.typesafe.config.ConfigFactory + val commonConfig = ConfigFactory.parseString(""" + akka { + loglevel = "WARNING" + actor { + provider = "akka.remote.RemoteActorRefProvider" + deployment { + /app/service-hello.router = "round-robin" + /app/service-hello.nr-of-instances = 3 + /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] + } + } + remote.server.hostname = "localhost" + }""") + + val node1Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9991" + cluster.nodename = "node1" + }""") withFallback commonConfig + + val node2Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9992" + cluster.nodename = "node2" + }""") withFallback commonConfig + + val node3Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9993" + cluster.nodename = "node3" + }""") withFallback commonConfig + + val node4Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9994" + cluster.nodename = "node4" + }""") withFallback commonConfig } -class RoundRobinRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { +class RoundRobinRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(RoundRobinRoutedRemoteActorMultiJvmSpec.node1Config) { import RoundRobinRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -30,7 +69,7 @@ class RoundRobinRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { } } -class RoundRobinRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { +class RoundRobinRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(RoundRobinRoutedRemoteActorMultiJvmSpec.node2Config) { import RoundRobinRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -45,7 +84,7 @@ class RoundRobinRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { } } -class RoundRobinRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec { +class RoundRobinRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec(RoundRobinRoutedRemoteActorMultiJvmSpec.node3Config) { import RoundRobinRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -60,7 +99,7 @@ class RoundRobinRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec { } } -class RoundRobinRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec { +class RoundRobinRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec(RoundRobinRoutedRemoteActorMultiJvmSpec.node4Config) { import RoundRobinRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "A new remote actor configured with a RoundRobin router" must { diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala similarity index 63% rename from akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala rename to akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala index 95c5037e8f..1a43c4ad5e 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala @@ -1,4 +1,4 @@ -package akka.remote.scatter_gather_routed +package akka.remote import akka.actor.Actor import akka.remote._ @@ -13,9 +13,48 @@ object ScatterGatherRoutedRemoteActorMultiJvmSpec { case "end" ⇒ self.stop() } } + + import com.typesafe.config.ConfigFactory + val commonConfig = ConfigFactory.parseString(""" + akka { + loglevel = "WARNING" + actor { + provider = "akka.remote.RemoteActorRefProvider" + deployment { + /app/service-hello.router = "scatter-gather" + /app/service-hello.nr-of-instances = 3 + /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] + } + } + remote.server.hostname = "localhost" + }""") + + val node1Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9991" + cluster.nodename = "node1" + }""") withFallback commonConfig + + val node2Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9992" + cluster.nodename = "node2" + }""") withFallback commonConfig + + val node3Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9993" + cluster.nodename = "node3" + }""") withFallback commonConfig + + val node4Config = ConfigFactory.parseString(""" + akka { + remote.server.port = "9994" + cluster.nodename = "node4" + }""") withFallback commonConfig } -class ScatterGatherRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { +class ScatterGatherRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(ScatterGatherRoutedRemoteActorMultiJvmSpec.node1Config) { import ScatterGatherRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -30,7 +69,7 @@ class ScatterGatherRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { } } -class ScatterGatherRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { +class ScatterGatherRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(ScatterGatherRoutedRemoteActorMultiJvmSpec.node2Config) { import ScatterGatherRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -45,7 +84,7 @@ class ScatterGatherRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { } } -class ScatterGatherRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec { +class ScatterGatherRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec(ScatterGatherRoutedRemoteActorMultiJvmSpec.node3Config) { import ScatterGatherRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "___" must { @@ -60,7 +99,7 @@ class ScatterGatherRoutedRemoteActorMultiJvmNode3 extends AkkaRemoteSpec { } } -class ScatterGatherRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec { +class ScatterGatherRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec(ScatterGatherRoutedRemoteActorMultiJvmSpec.node4Config) { import ScatterGatherRoutedRemoteActorMultiJvmSpec._ val nodes = NrOfNodes "A new remote actor configured with a ScatterGather router" must { diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.conf b/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.conf deleted file mode 100644 index 1b1c7b398c..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "direct" - /app/service-hello.nr-of-instances = 1 - /app/service-hello.remote.nodes = ["localhost:9991"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.opts b/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.opts deleted file mode 100644 index a3218fe698..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode1.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node1 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9991 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.conf b/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.conf deleted file mode 100644 index 1b1c7b398c..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "direct" - /app/service-hello.nr-of-instances = 1 - /app/service-hello.remote.nodes = ["localhost:9991"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.opts b/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.opts deleted file mode 100644 index dcecc85ffb..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/direct_routed/DirectRoutedRemoteActorMultiJvmNode2.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node2 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9992 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.conf b/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.conf deleted file mode 100644 index 9073ed4ed3..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.conf +++ /dev/null @@ -1,9 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.remote.nodes = ["localhost:9991"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.opts b/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.opts deleted file mode 100644 index a3218fe698..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode1.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node1 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9991 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.conf b/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.conf deleted file mode 100644 index 9073ed4ed3..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.conf +++ /dev/null @@ -1,9 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.remote.nodes = ["localhost:9991"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.opts b/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.opts deleted file mode 100644 index dcecc85ffb..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmNode2.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node2 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9992 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmSpec.scala deleted file mode 100644 index 3be4979964..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/new_remote_actor/NewRemoteActorMultiJvmSpec.scala +++ /dev/null @@ -1,57 +0,0 @@ -package akka.remote.new_remote_actor - -import akka.actor.Actor -import akka.remote._ - -object NewRemoteActorMultiJvmSpec { - val NrOfNodes = 2 - - class SomeActor extends Actor with Serializable { - def receive = { - case "identify" ⇒ sender ! system.nodename - } - } -} - -class NewRemoteActorMultiJvmNode1 extends AkkaRemoteSpec { - - import NewRemoteActorMultiJvmSpec._ - - val nodes = NrOfNodes - - "___" must { - "___" in { - barrier("setup") - - remote.start() - - barrier("start") - - barrier("done") - } - } -} - -class NewRemoteActorMultiJvmNode2 extends AkkaRemoteSpec { - - import NewRemoteActorMultiJvmSpec._ - - val nodes = NrOfNodes - - "A new remote actor" must { - "be locally instantiated on a remote node and be able to communicate through its RemoteActorRef" in { - barrier("setup") - - remote.start() - - barrier("start") - - val actor = system.actorOf[SomeActor]("service-hello") - val result = (actor ? "identify").get - result must equal("node1") - - barrier("done") - } - } -} - diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.conf b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.conf deleted file mode 100644 index e373bc9c0e..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "random" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.opts b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.opts deleted file mode 100644 index a3218fe698..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode1.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node1 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9991 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.conf b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.conf deleted file mode 100644 index b6d6e7b3f9..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.conf +++ /dev/null @@ -1,9 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment./app/service-hello.router = "random" - deployment./app/service-hello.nr-of-instances = 3 - deployment./app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.opts b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.opts deleted file mode 100644 index dcecc85ffb..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode2.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node2 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9992 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.conf b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.conf deleted file mode 100644 index e373bc9c0e..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "random" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.opts b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.opts deleted file mode 100644 index cabc575688..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode3.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node3 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9993 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.conf b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.conf deleted file mode 100644 index e373bc9c0e..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "random" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.opts b/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.opts deleted file mode 100644 index 4c7670d733..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/random_routed/RandomRoutedRemoteActorMultiJvmNode4.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node4 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9994 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.conf b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.conf deleted file mode 100644 index a0ec833383..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "round-robin" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.opts b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.opts deleted file mode 100644 index a3218fe698..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode1.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node1 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9991 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.conf b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.conf deleted file mode 100644 index a0ec833383..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "round-robin" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.opts b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.opts deleted file mode 100644 index dcecc85ffb..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode2.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node2 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9992 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.conf b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.conf deleted file mode 100644 index a0ec833383..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "round-robin" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.opts b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.opts deleted file mode 100644 index cabc575688..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode3.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node3 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9993 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.conf b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.conf deleted file mode 100644 index a0ec833383..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "round-robin" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.opts b/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.opts deleted file mode 100644 index 4c7670d733..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/round_robin_routed/RoundRobinRoutedRemoteActorMultiJvmNode4.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node4 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9994 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.conf b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.conf deleted file mode 100644 index 80ad72e3de..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "scatter-gather" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.opts b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.opts deleted file mode 100644 index a3218fe698..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode1.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node1 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9991 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.conf b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.conf deleted file mode 100644 index 80ad72e3de..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "scatter-gather" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.opts b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.opts deleted file mode 100644 index dcecc85ffb..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode2.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node2 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9992 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.conf b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.conf deleted file mode 100644 index 80ad72e3de..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "scatter-gather" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.opts b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.opts deleted file mode 100644 index cabc575688..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode3.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node3 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9993 diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.conf b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.conf deleted file mode 100644 index 80ad72e3de..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loglevel = "WARNING" - actor { - provider = "akka.remote.RemoteActorRefProvider" - deployment { - /app/service-hello.router = "scatter-gather" - /app/service-hello.nr-of-instances = 3 - /app/service-hello.remote.nodes = ["localhost:9991","localhost:9992","localhost:9993"] - } - } -} diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.opts b/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.opts deleted file mode 100644 index 4c7670d733..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/scatter_gather_routed/ScatterGatherRoutedRemoteActorMultiJvmNode4.opts +++ /dev/null @@ -1 +0,0 @@ --Dakka.cluster.nodename=node4 -Dakka.remote.server.hostname=localhost -Dakka.remote.server.port=9994 From 064a8a7be1685be95be9a17f5fd8e8453d20fbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Mon, 5 Dec 2011 11:42:52 +0100 Subject: [PATCH 2/4] Added fallback to testConfig in AkkaRemoteSpec --- .../src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala index 58679eaccd..2c9274c84f 100644 --- a/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala +++ b/akka-remote/src/multi-jvm/scala/akka/remote/AkkaRemoteSpec.scala @@ -26,7 +26,9 @@ object AkkaRemoteSpec { } } -abstract class AkkaRemoteSpec(config: Config = AkkaRemoteSpec.testConf) extends AkkaSpec(config) with MultiJvmSync { +abstract class AkkaRemoteSpec(config: Config) + extends AkkaSpec(config.withFallback(AkkaRemoteSpec.testConf)) + with MultiJvmSync { /** * Helper function for accessing the underlying remoting. From 553d1da347dc9236ca98289abc01327779545d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Mon, 5 Dec 2011 11:48:17 +0100 Subject: [PATCH 3/4] Cleaned up inconsistent logging messages --- .../src/main/scala/akka/actor/ActorCell.scala | 38 +++++++++---------- .../src/main/scala/akka/actor/ActorRef.scala | 8 ++-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index c7a37de589..ed9b90c32f 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -192,22 +192,22 @@ private[akka] class ActorCell( actor = created created.preStart() checkReceiveTimeout - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "started (" + actor + ")")) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Started [" + actor + "]")) } catch { // FIXME catching all and continue isn't good for OOME, ticket #1418 case e ⇒ try { - system.eventStream.publish(Error(e, self.toString, "error while creating actor")) + system.eventStream.publish(Error(e, self.toString, "Error while creating actor")) // prevent any further messages to be processed until the actor has been restarted dispatcher.suspend(this) } finally { - parent.tell(Failed(ActorInitializationException(self, "exception during creation", e)), self) + parent.tell(Failed(ActorInitializationException(self, "Exception during creation", e)), self) } } def recreate(cause: Throwable): Unit = try { val failedActor = actor - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "restarting")) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Restarting")) val freshActor = newActor() if (failedActor ne null) { val c = currentMessage //One read only plz @@ -221,7 +221,7 @@ private[akka] class ActorCell( } actor = freshActor // assign it here so if preStart fails, we can null out the sef-refs next call freshActor.postRestart(cause) - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "restarted")) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Restarted")) dispatcher.resume(this) //FIXME should this be moved down? @@ -229,11 +229,11 @@ private[akka] class ActorCell( } catch { // FIXME catching all and continue isn't good for OOME, ticket #1418 case e ⇒ try { - system.eventStream.publish(Error(e, self.toString, "error while creating actor")) + system.eventStream.publish(Error(e, self.toString, "Error while creating actor")) // prevent any further messages to be processed until the actor has been restarted dispatcher.suspend(this) } finally { - parent.tell(Failed(ActorInitializationException(self, "exception during re-creation", e)), self) + parent.tell(Failed(ActorInitializationException(self, "Exception during re-creation", e)), self) } } @@ -248,7 +248,7 @@ private[akka] class ActorCell( val c = children if (c.isEmpty) doTerminate() else { - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "stopping")) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Stopping")) for (child ← c) child.stop() stopping = true } @@ -258,12 +258,12 @@ private[akka] class ActorCell( val stat = childrenRefs.get(child.name) if (stat.isDefined) { if (stat.get.child == child) - system.eventStream.publish(Warning(self.toString, "Already supervising " + child)) + system.eventStream.publish(Warning(self.toString, "Already supervising [" + child + "]")) else - system.eventStream.publish(Warning(self.toString, "Already supervising other child with same name '" + child.name + "', old: " + stat.get + " new: " + child)) + system.eventStream.publish(Warning(self.toString, "Already supervising other child with same name [" + child.name + "], old: [" + stat.get + "], new: [" + child + "]")) } else { childrenRefs = childrenRefs.updated(child.name, ChildRestartStats(child)) - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "now supervising " + child)) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Now supervising [" + child + "]")) } } @@ -277,10 +277,10 @@ private[akka] class ActorCell( case Recreate(cause) ⇒ recreate(cause) case Link(subject) ⇒ system.deathWatch.subscribe(self, subject) - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "now monitoring " + subject)) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Now monitoring [" + subject + "]")) case Unlink(subject) ⇒ system.deathWatch.unsubscribe(self, subject) - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "stopped monitoring " + subject)) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Stopped monitoring [" + subject + "]")) case Suspend() ⇒ suspend() case Resume() ⇒ resume() case Terminate() ⇒ terminate() @@ -288,7 +288,7 @@ private[akka] class ActorCell( } } catch { case e ⇒ //Should we really catch everything here? - system.eventStream.publish(Error(e, self.toString, "error while processing " + message)) + system.eventStream.publish(Error(e, self.toString, "Error while processing [" + message + "]")) //TODO FIXME How should problems here be handled??? throw e } @@ -347,7 +347,7 @@ private[akka] class ActorCell( } def autoReceiveMessage(msg: Envelope) { - if (system.settings.DebugAutoReceive) system.eventStream.publish(Debug(self.toString, "received AutoReceiveMessage " + msg)) + if (system.settings.DebugAutoReceive) system.eventStream.publish(Debug(self.toString, "Received AutoReceiveMessage " + msg)) if (stopping) msg.message match { case ChildTerminated ⇒ handleChildTerminated(sender) @@ -365,7 +365,7 @@ private[akka] class ActorCell( private def doTerminate() { if (!system.provider.evict(self.path.toString)) - system.eventStream.publish(Warning(self.toString, "evict of " + self.path.toString + " failed")) + system.eventStream.publish(Warning(self.toString, "Evict of [" + self.path.toString + "] failed")) dispatcher.detach(this) @@ -376,7 +376,7 @@ private[akka] class ActorCell( try { parent.tell(ChildTerminated, self) system.deathWatch.publish(Terminated(self)) - if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "stopped")) + if (system.settings.DebugLifecycle) system.eventStream.publish(Debug(self.toString, "Stopped")) } finally { currentMessage = null clearActorFields() @@ -386,8 +386,8 @@ private[akka] class ActorCell( final def handleFailure(child: ActorRef, cause: Throwable): Unit = childrenRefs.get(child.name) match { case Some(stats) if stats.child == child ⇒ if (!props.faultHandler.handleFailure(child, cause, stats, childrenRefs.values)) throw cause - case Some(stats) ⇒ system.eventStream.publish(Warning(self.toString, "dropping Failed(" + cause + ") from unknown child " + child + " matching names but not the same, was: " + stats.child)) - case None ⇒ system.eventStream.publish(Warning(self.toString, "dropping Failed(" + cause + ") from unknown child " + child)) + case Some(stats) ⇒ system.eventStream.publish(Warning(self.toString, "Dropping Failed[" + cause + "] from unknown child [" + child + "] matching names but not the same, was: " + stats.child)) + case None ⇒ system.eventStream.publish(Warning(self.toString, "Dropping Failed[" + cause + "] from unknown child [" + child + "]")) } final def handleChildTerminated(child: ActorRef): Unit = { diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index c3865c001b..3c27298821 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -271,7 +271,7 @@ case class SerializedActorRef(hostname: String, port: Int, path: String) { def readResolve(): AnyRef = currentSystem.value match { case null ⇒ throw new IllegalStateException( "Trying to deserialize a serialized ActorRef without an ActorSystem in scope." + - " Use akka.serialization.Serialization.currentSystem.withValue(system) { ... }") + " Use 'akka.serialization.Serialization.currentSystem.withValue(system) { ... }'") case someSystem ⇒ someSystem.provider.deserialize(this) match { case Some(actor) ⇒ actor case None ⇒ throw new IllegalStateException("Could not deserialize ActorRef") @@ -287,7 +287,7 @@ trait MinimalActorRef extends ActorRef with ScalaActorRef with RefInternals { private[akka] val uuid: Uuid = newUuid() def name: String = uuid.toString - //FIXME REMOVE THIS, ticket #1416 + //FIXME REMOVE THIS, ticket #1416 //FIXME REMOVE THIS, ticket #1415 def suspend(): Unit = () def resume(): Unit = () @@ -299,7 +299,7 @@ trait MinimalActorRef extends ActorRef with ScalaActorRef with RefInternals { def !(message: Any)(implicit sender: ActorRef = null): Unit = () def ?(message: Any)(implicit timeout: Timeout): Future[Any] = - throw new UnsupportedOperationException("Not supported for %s".format(getClass.getName)) + throw new UnsupportedOperationException("Not supported for [%s]".format(getClass.getName)) protected[akka] def sendSystemMessage(message: SystemMessage): Unit = () protected[akka] def restart(cause: Throwable): Unit = () @@ -380,7 +380,7 @@ abstract class AskActorRef(val path: ActorPath, provider: ActorRefProvider, deat } override def ?(message: Any)(implicit timeout: Timeout): Future[Any] = - new KeptPromise[Any](Left(new UnsupportedOperationException("Ask/? is not supported for %s".format(getClass.getName))))(dispatcher) + new KeptPromise[Any](Left(new UnsupportedOperationException("'ask/?'' is not supported for [%s]".format(getClass.getName))))(dispatcher) override def isTerminated = result.isCompleted || result.isExpired From 991a4a3fd9ea2faea8d2ae1e44941a1560d252a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Fri, 9 Dec 2011 17:46:29 +0100 Subject: [PATCH 4/4] Removed multi-jvm test for gossip. Will reintroduce later, but first write in-process tests for the gossip using the new remoting. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas Bonér --- .../remote/GossipMembershipMultiJvmSpec.scala | 134 ------------------ 1 file changed, 134 deletions(-) delete mode 100644 akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala deleted file mode 100644 index 878b7840b0..0000000000 --- a/akka-remote/src/multi-jvm/scala/akka/remote/GossipMembershipMultiJvmSpec.scala +++ /dev/null @@ -1,134 +0,0 @@ -// package akka.remote - -// import akka.actor.Actor -// import akka.remote._ -// import akka.routing._ -// import akka.routing.Routing.Broadcast - -// object GossipMembershipMultiJvmSpec { -// val NrOfNodes = 4 -// class SomeActor extends Actor with Serializable { -// def receive = { -// case "hit" ⇒ sender ! system.nodename -// case "end" ⇒ self.stop() -// } -// } - -// import com.typesafe.config.ConfigFactory -// val commonConfig = ConfigFactory.parseString(""" -// akka { -// loglevel = "WARNING" -// cluster { -// seed-nodes = ["localhost:9991"] -// } -// remote.server.hostname = "localhost" -// }""") - -// val node1Config = ConfigFactory.parseString(""" -// akka { -// remote.server.port = "9991" -// cluster.nodename = "node1" -// }""") withFallback commonConfig - -// val node2Config = ConfigFactory.parseString(""" -// akka { -// remote.server.port = "9992" -// cluster.nodename = "node2" -// }""") withFallback commonConfig - -// val node3Config = ConfigFactory.parseString(""" -// akka { -// remote.server.port = "9993" -// cluster.nodename = "node3" -// }""") withFallback commonConfig - -// val node4Config = ConfigFactory.parseString(""" -// akka { -// remote.server.port = "9994" -// cluster.nodename = "node4" -// }""") withFallback commonConfig -// } - -// class GossipMembershipMultiJvmNode1 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node1Config) { -// import GossipMembershipMultiJvmSpec._ -// val nodes = NrOfNodes -// "A cluster" must { -// "allow new node to join and should reach convergence with new membership table" in { - -// barrier("setup") -// remote.start() - -// barrier("start") -// val actor = system.actorOf[SomeActor]("service-hello") -// actor.isInstanceOf[RoutedActorRef] must be(true) - -// val connectionCount = NrOfNodes - 1 -// val iterationCount = 10 - -// var replies = Map( -// "node1" -> 0, -// "node2" -> 0, -// "node3" -> 0) - -// for (i ← 0 until iterationCount) { -// for (k ← 0 until connectionCount) { -// val nodeName = (actor ? "hit").as[String].getOrElse(fail("No id returned by actor")) -// replies = replies + (nodeName -> (replies(nodeName) + 1)) -// } -// } - -// barrier("broadcast-end") -// actor ! Broadcast("end") - -// barrier("end") -// replies.values foreach { _ must be > (0) } - -// barrier("done") -// } -// } -// } - -// class GossipMembershipMultiJvmNode2 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node2Config) { -// import GossipMembershipMultiJvmSpec._ -// val nodes = NrOfNodes -// "___" must { -// "___" in { -// barrier("setup") -// remote.start() -// barrier("start") -// barrier("broadcast-end") -// barrier("end") -// barrier("done") -// } -// } -// } - -// class GossipMembershipMultiJvmNode3 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node3Config) { -// import GossipMembershipMultiJvmSpec._ -// val nodes = NrOfNodes -// "___" must { -// "___" in { -// barrier("setup") -// remote.start() -// barrier("start") -// barrier("broadcast-end") -// barrier("end") -// barrier("done") -// } -// } -// } - -// class GossipMembershipMultiJvmNode4 extends AkkaRemoteSpec(GossipMembershipMultiJvmSpec.node4Config) { -// import GossipMembershipMultiJvmSpec._ -// val nodes = NrOfNodes -// "___" must { -// "___" in { -// barrier("setup") -// remote.start() -// barrier("start") -// barrier("broadcast-end") -// barrier("end") -// barrier("done") -// } -// } -// }