From e55cde2591bc9013a7c6fd450c0fb0363a82b093 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 11 Sep 2012 20:49:08 +0200 Subject: [PATCH] Rename to allowLocalRoutees in code also, see #2103 --- .../cluster/ClusterActorRefProvider.scala | 2 +- .../cluster/routing/ClusterRouterConfig.scala | 26 +++++++++---------- .../akka/cluster/ClusterDeployerSpec.scala | 4 +-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala index 6f35dc1660..bb0634876e 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala @@ -43,7 +43,7 @@ private[akka] class ClusterDeployer(_settings: ActorSystem.Settings, _pm: Dynami val clusterRouterSettings = ClusterRouterSettings( totalInstances = deploy.config.getInt("nr-of-instances"), maxInstancesPerNode = deploy.config.getInt("cluster.max-nr-of-instances-per-node"), - routeesOnOwnNode = deploy.config.getBoolean("cluster.allow-local-routees"), + allowLocalRoutees = deploy.config.getBoolean("cluster.allow-local-routees"), routeesPath = deploy.config.getString("cluster.routees-path")) Some(deploy.copy( diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala index e6fcc190f3..89622867af 100644 --- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala +++ b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala @@ -76,26 +76,26 @@ object ClusterRouterSettings { /** * Settings for create and deploy of the routees */ - def apply(totalInstances: Int, maxInstancesPerNode: Int, routeesOnOwnNode: Boolean): ClusterRouterSettings = - new ClusterRouterSettings(totalInstances, maxInstancesPerNode, routeesOnOwnNode) + def apply(totalInstances: Int, maxInstancesPerNode: Int, allowLocalRoutees: Boolean): ClusterRouterSettings = + new ClusterRouterSettings(totalInstances, maxInstancesPerNode, allowLocalRoutees) /** * Settings for remote deployment of the routees, allowed to use routees on own node */ def apply(totalInstances: Int, maxInstancesPerNode: Int): ClusterRouterSettings = - apply(totalInstances, maxInstancesPerNode, routeesOnOwnNode = true) + apply(totalInstances, maxInstancesPerNode, allowLocalRoutees = true) /** * Settings for lookup of the routees */ - def apply(totalInstances: Int, routeesPath: String, routeesOnOwnNode: Boolean): ClusterRouterSettings = - new ClusterRouterSettings(totalInstances, routeesPath, routeesOnOwnNode) + def apply(totalInstances: Int, routeesPath: String, allowLocalRoutees: Boolean): ClusterRouterSettings = + new ClusterRouterSettings(totalInstances, routeesPath, allowLocalRoutees) /** * Settings for lookup of the routees, allowed to use routees on own node */ def apply(totalInstances: Int, routeesPath: String): ClusterRouterSettings = - apply(totalInstances, routeesPath, routeesOnOwnNode = true) + apply(totalInstances, routeesPath, allowLocalRoutees = true) } /** @@ -108,21 +108,21 @@ case class ClusterRouterSettings private[akka] ( totalInstances: Int, maxInstancesPerNode: Int, routeesPath: String, - routeesOnOwnNode: Boolean) { + allowLocalRoutees: Boolean) { /** * Settings for create and deploy of the routees * JAVA API */ - def this(totalInstances: Int, maxInstancesPerNode: Int, routeesOnOwnNode: Boolean) = - this(totalInstances, maxInstancesPerNode, routeesPath = "", routeesOnOwnNode) + def this(totalInstances: Int, maxInstancesPerNode: Int, allowLocalRoutees: Boolean) = + this(totalInstances, maxInstancesPerNode, routeesPath = "", allowLocalRoutees) /** * Settings for lookup of the routees * JAVA API */ - def this(totalInstances: Int, routeesPath: String, routeesOnOwnNode: Boolean) = - this(totalInstances, maxInstancesPerNode = 1, routeesPath, routeesOnOwnNode) + def this(totalInstances: Int, routeesPath: String, allowLocalRoutees: Boolean) = + this(totalInstances, maxInstancesPerNode = 1, routeesPath, allowLocalRoutees) if (totalInstances <= 0) throw new IllegalArgumentException("totalInstances of cluster router must be > 0") if (maxInstancesPerNode <= 0) throw new IllegalArgumentException("maxInstancesPerNode of cluster router must be > 0") @@ -213,7 +213,7 @@ private[akka] class ClusterRouteeProvider( private[routing] def availbleNodes: SortedSet[Address] = { import Member.addressOrdering val currentNodes = nodes - if (currentNodes.isEmpty && settings.routeesOnOwnNode) + if (currentNodes.isEmpty && settings.allowLocalRoutees) //use my own node, cluster information not updated yet SortedSet(cluster.selfAddress) else @@ -229,7 +229,7 @@ private[akka] class ClusterRouteeProvider( } private[routing] def isAvailble(m: Member): Boolean = { - m.status == MemberStatus.Up && (settings.routeesOnOwnNode || m.address != cluster.selfAddress) + m.status == MemberStatus.Up && (settings.allowLocalRoutees || m.address != cluster.selfAddress) } } diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala index 61c62ad69d..6432b991ab 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala @@ -53,7 +53,7 @@ class ClusterDeployerSpec extends AkkaSpec(ClusterDeployerSpec.deployerConf) { service, deployment.get.config, ClusterRouterConfig(RoundRobinRouter(20), ClusterRouterSettings( - totalInstances = 20, maxInstancesPerNode = 3, routeesOnOwnNode = false)), + totalInstances = 20, maxInstancesPerNode = 3, allowLocalRoutees = false)), ClusterScope))) } @@ -67,7 +67,7 @@ class ClusterDeployerSpec extends AkkaSpec(ClusterDeployerSpec.deployerConf) { service, deployment.get.config, ClusterRouterConfig(RoundRobinRouter(20), ClusterRouterSettings( - totalInstances = 20, routeesPath = "/user/myservice", routeesOnOwnNode = false)), + totalInstances = 20, routeesPath = "/user/myservice", allowLocalRoutees = false)), ClusterScope))) }