diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala index 6745eb1370..c3d4986a62 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala @@ -58,7 +58,7 @@ class ClusterActorRef private[akka] (inetSocketAddresses: Array[Tuple2[UUID, Ine } private[akka] def failOver(from: InetSocketAddress, to: InetSocketAddress): Unit = { - EventHandler.info(this, "ClusterActorRef. %s failover from %s to %s".format(address, from, to)) + EventHandler.debug(this, "ClusterActorRef. %s failover from %s to %s".format(address, from, to)) @tailrec def doFailover(from: InetSocketAddress, to: InetSocketAddress): Unit = { @@ -96,7 +96,7 @@ class ClusterActorRef private[akka] (inetSocketAddresses: Array[Tuple2[UUID, Ine } def signalDeadActor(ref: ActorRef): Unit = { - EventHandler.info(this, "ClusterActorRef %s signalDeadActor %s".format(address, ref.address)) + EventHandler.debug(this, "ClusterActorRef %s signalDeadActor %s".format(address, ref.address)) //since the number remote actor refs for a clustered actor ref is quite low, we can deal with the O(N) complexity //of the following removal. diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala index 9bc162ab52..91b8caeb0b 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/random/replicationfactor_3/Random3ReplicasMultiJvmSpec.scala @@ -80,9 +80,14 @@ class Random3ReplicasMultiJvmNode2 extends ClusterTestNode { count((hello ? "Hello").as[String].getOrElse(fail("Should have recieved reply from a node"))) } - assert(replies("World from node [node1]") > 100) - assert(replies("World from node [node2]") > 100) - assert(replies("World from node [node3]") > 100) + val repliesNode1 = replies("World from node [node1]") + val repliesNode2 = replies("World from node [node2]") + val repliesNode3 = replies("World from node [node3]") + + assert(repliesNode1 > 100) + assert(repliesNode2 > 100) + assert(repliesNode3 > 100) + assert(repliesNode1 + repliesNode2 + repliesNode3 === 1000) barrier("end", NrOfNodes).await() diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala index bc33d0c078..9f42cb19aa 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/roundrobin/replicationfactor_1/RoundRobin1ReplicaMultiJvmSpec.scala @@ -4,14 +4,9 @@ package akka.cluster.routing.roundrobin.replicationfactor_1 -import org.scalatest.WordSpec -import org.scalatest.matchers.MustMatchers -import org.scalatest.BeforeAndAfterAll - import akka.cluster._ import Cluster._ import akka.actor._ -import akka.actor.Actor._ import akka.config.Config /** @@ -25,9 +20,11 @@ object RoundRobin1ReplicaMultiJvmSpec { self.reply("World from node [" + Config.nodename + "]") } } + } class RoundRobin1ReplicaMultiJvmNode1 extends MasterClusterTestNode { + import RoundRobin1ReplicaMultiJvmSpec._ val testNodes = 1