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

Fixed broken tests: RoundRobin2Replicas and RoundRobin3Replicas

Browse source 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2011-08-18 17:16:25 +02:00
parent ea95588a50
commit ea92c552d3
5 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-cluster/src/main/scala/akka/cluster/Cluster.scala
View file

@ -531,8 +531,6 @@ class DefaultClusterNode private[akka] (
}
private[cluster] def publish(change: ChangeNotification) {
println("=============================================================== PUBLISH")
println("=======>>> change: " + change)
changeListeners.iterator.foreach(_.notify(change, this))
}

1
akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode1.conf
View file

@ -1,5 +1,4 @@
akka.enabled-modules = ["cluster"]
akka.event-handler-level = "WARNING"
akka.actor.deployment.service-hello.router = "round-robin"
akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1","node:node2"]
akka.actor.deployment.service-hello.clustered.replication-factor = 2

1
akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmNode2.conf
View file

@ -1,5 +1,4 @@
akka.enabled-modules = ["cluster"]
akka.event-handler-level = "WARNING"
akka.actor.deployment.service-hello.router = "round-robin"
akka.actor.deployment.service-hello.clustered.preferred-nodes = ["node:node1","node:node2"]
akka.actor.deployment.service-hello.clustered.replication-factor = 2

32
akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_2/RoundRobin2ReplicasMultiJvmSpec.scala
View file

@ -37,9 +37,11 @@ object RoundRobin2ReplicasMultiJvmSpec {
* What is the purpose of this node? Is this just a node for the cluster to make use of?
*/
class RoundRobin2ReplicasMultiJvmNode1 extends WordSpec with MustMatchers with BeforeAndAfterAll {
class RoundRobin2ReplicasMultiJvmNode1 extends MasterClusterTestNode {
import RoundRobin2ReplicasMultiJvmSpec._
val testNodes = NrOfNodes
"Round Robin: A cluster" must {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
@ -52,31 +54,27 @@ class RoundRobin2ReplicasMultiJvmNode1 extends WordSpec with MustMatchers with B
}
//wait till ndoe 2 has started.
barrier("start-node2", NrOfNodes).await()
barrier("start-node2", NrOfNodes) {
}
//wait till node 3 has started.
barrier("start-node3", NrOfNodes).await()
barrier("start-node3", NrOfNodes) {
}
//wait till an actor reference on node 2 has become available.
barrier("get-ref-to-actor-on-node2", NrOfNodes).await()
barrier("get-ref-to-actor-on-node2", NrOfNodes) {
}
//wait till the node 2 has send a message to the replica's.
barrier("send-message-from-node2-to-replicas", NrOfNodes).await()
barrier("send-message-from-node2-to-replicas", NrOfNodes) {
}
node.shutdown()
}
}
override def beforeAll() {
startLocalCluster()
}
override def afterAll() {
shutdownLocalCluster()
}
}
class RoundRobin2ReplicasMultiJvmNode2 extends WordSpec with MustMatchers {
class RoundRobin2ReplicasMultiJvmNode2 extends ClusterTestNode {
import RoundRobin2ReplicasMultiJvmSpec._
"Round Robin: A cluster" must {
@ -86,7 +84,8 @@ class RoundRobin2ReplicasMultiJvmNode2 extends WordSpec with MustMatchers {
System.getProperty("akka.cluster.port", "") must be("9992")
//wait till node 1 has started.
barrier("start-node1", NrOfNodes).await()
barrier("start-node1", NrOfNodes) {
}
//wait till node 2 has started.
barrier("start-node2", NrOfNodes) {
@ -94,7 +93,8 @@ class RoundRobin2ReplicasMultiJvmNode2 extends WordSpec with MustMatchers {
}
//wait till node 3 has started.
barrier("start-node3", NrOfNodes).await()
barrier("start-node3", NrOfNodes) {
}
//check if the actorRef is the expected remoteActorRef.
var hello: ActorRef = null

52
akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_3/RoundRobin3ReplicasMultiJvmSpec.scala
View file

@ -33,12 +33,14 @@ object RoundRobin3ReplicasMultiJvmSpec {
/**
* What is the purpose of this node? Is this just a node for the cluster to make use of?
*/
class RoundRobin3ReplicasMultiJvmNode1 extends WordSpec with MustMatchers with BeforeAndAfterAll {
class RoundRobin3ReplicasMultiJvmNode1 extends MasterClusterTestNode {
import RoundRobin3ReplicasMultiJvmSpec._
val testNodes = NrOfNodes
"Round Robin: A cluster" must {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" ignore {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
//wait till node 1 has started.
barrier("start-node1", NrOfNodes) {
@ -46,40 +48,37 @@ class RoundRobin3ReplicasMultiJvmNode1 extends WordSpec with MustMatchers with B
}
//wait till ndoe 2 has started.
barrier("start-node2", NrOfNodes).await()
barrier("start-node2", NrOfNodes) {
}
//wait till node 3 has started.
barrier("start-node3", NrOfNodes).await()
barrier("start-node3", NrOfNodes) {
}
//wait till an actor reference on node 2 has become available.
barrier("get-ref-to-actor-on-node2", NrOfNodes).await()
barrier("get-ref-to-actor-on-node2", NrOfNodes) {
}
//wait till the node 2 has send a message to the replica's.
barrier("send-message-from-node2-to-replicas", NrOfNodes).await()
barrier("send-message-from-node2-to-replicas", NrOfNodes) {
}
node.shutdown()
}
}
override def beforeAll() {
startLocalCluster()
}
override def afterAll() {
shutdownLocalCluster()
}
}
class RoundRobin3ReplicasMultiJvmNode2 extends WordSpec with MustMatchers {
class RoundRobin3ReplicasMultiJvmNode2 extends ClusterTestNode {
import RoundRobin3ReplicasMultiJvmSpec._
import Cluster._
"Round Robin: A cluster" must {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" ignore {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
//wait till node 1 has started.
barrier("start-node1", NrOfNodes).await()
barrier("start-node1", NrOfNodes) {
}
//wait till node 2 has started.
barrier("start-node2", NrOfNodes) {
@ -87,7 +86,8 @@ class RoundRobin3ReplicasMultiJvmNode2 extends WordSpec with MustMatchers {
}
//wait till node 3 has started.
barrier("start-node3", NrOfNodes).await()
barrier("start-node3", NrOfNodes) {
}
//check if the actorRef is the expected remoteActorRef.
var hello: ActorRef = null
@ -131,24 +131,28 @@ class RoundRobin3ReplicasMultiJvmNode2 extends WordSpec with MustMatchers {
}
}
class RoundRobin3ReplicasMultiJvmNode3 extends WordSpec with MustMatchers {
class RoundRobin3ReplicasMultiJvmNode3 extends ClusterTestNode {
import RoundRobin3ReplicasMultiJvmSpec._
import Cluster._
"Round Robin: A cluster" must {
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" ignore {
barrier("start-node1", NrOfNodes).await()
"create clustered actor, get a 'local' actor on 'home' node and a 'ref' to actor on remote node" in {
barrier("start-node1", NrOfNodes) {
}
barrier("start-node2", NrOfNodes).await()
barrier("start-node2", NrOfNodes) {
}
barrier("start-node3", NrOfNodes) {
Cluster.node
}
barrier("get-ref-to-actor-on-node2", NrOfNodes).await()
barrier("get-ref-to-actor-on-node2", NrOfNodes) {
}
barrier("send-message-from-node2-to-replicas", NrOfNodes).await()
barrier("send-message-from-node2-to-replicas", NrOfNodes) {
}
node.shutdown()
}