diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala index 3ff416f2a7..62f5aaa0ce 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala @@ -531,6 +531,8 @@ class DefaultClusterNode private[akka] ( } private[cluster] def publish(change: ChangeNotification) { + println("=============================================================== PUBLISH") + println("=======>>> change: " + change) changeListeners.iterator.foreach(_.notify(change, this)) } diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala index 20b7c538da..a1b8574ef4 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala @@ -26,13 +26,6 @@ class NewLeaderChangeListenerMultiJvmNode1 extends MasterClusterTestNode { "A NewLeader change listener" must { "be invoked after leader election is completed" in { - val latch = new CountDownLatch(1) - node.register(new ChangeListener { - override def newLeader(node: String, client: ClusterNode) { - latch.countDown - } - }) - barrier("start-node1", NrOfNodes) { Cluster.node } @@ -40,8 +33,6 @@ class NewLeaderChangeListenerMultiJvmNode1 extends MasterClusterTestNode { barrier("start-node2", NrOfNodes) { } - latch.await(10, TimeUnit.SECONDS) must be === true - node.shutdown() } } @@ -52,14 +43,22 @@ class NewLeaderChangeListenerMultiJvmNode2 extends ClusterTestNode { "A NewLeader change listener" must { - "be invoked when a new node leaves the cluster" in { + "be invoked after leader election is completed" in { + val latch = new CountDownLatch(1) + barrier("start-node1", NrOfNodes) { } barrier("start-node2", NrOfNodes) { - Cluster.node + node.register(new ChangeListener { + override def newLeader(node: String, client: ClusterNode) { + latch.countDown + } + }) } + latch.await(10, TimeUnit.SECONDS) must be === true + node.shutdown() } } diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmSpec.scala index 4eda57acbf..ea1eb0b9cc 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/reflogic/ClusterActorRefCleanupMultiJvmSpec.scala @@ -24,10 +24,9 @@ object ClusterActorRefCleanupMultiJvmSpec { def receive = { case "Die" ⇒ - //println("Killing JVM: " + Cluster.node.nodeAddress) + println("Killing JVM: " + Cluster.node.nodeAddress) System.exit(0) - case _ ⇒ - //println("Hello") + case _ ⇒ {} } } diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala index e8176afe42..9f6b57ddbe 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/replication/transactionlog/writethrough/nosnapshot/ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmSpec.scala @@ -43,7 +43,6 @@ class ReplicationTransactionLogWriteThroughNoSnapshotMultiJvmNode1 extends Clust barrier("create-actor-on-node1", NrOfNodes) { val actorRef = Actor.actorOf[HelloWorld]("hello-world").start() - node.isInUseOnNode("hello-world") must be(true) actorRef.address must be("hello-world") for (i ← 0 until 10) (actorRef ? Count(i)).as[String] must be(Some("World from node [node1]"))