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

=clu #13802 Introduce max-total-nr-of-instances for cluster aware routers

Browse source
This commit is contained in:
Patrik Nordwall 2015-08-20 15:13:35 +02:00
parent 12bee9433e
commit bc13e1b4c2
23 changed files with 77 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala
View file

@ -32,7 +32,7 @@ import scala.collection.immutable
object ClusterRouterGroupSettings {
def fromConfig(config: Config): ClusterRouterGroupSettings =
ClusterRouterGroupSettings(
totalInstances = config.getInt("nr-of-instances"),
totalInstances = ClusterRouterSettingsBase.getMaxTotalNrOfInstances(config),
routeesPaths = immutableSeq(config.getStringList("routees.paths")),
allowLocalRoutees = config.getBoolean("cluster.allow-local-routees"),
useRole = ClusterRouterSettingsBase.useRoleOption(config.getString("cluster.use-role")))
@ -69,7 +69,7 @@ final case class ClusterRouterGroupSettings(
object ClusterRouterPoolSettings {
def fromConfig(config: Config): ClusterRouterPoolSettings =
ClusterRouterPoolSettings(
totalInstances = config.getInt("nr-of-instances"),
totalInstances = ClusterRouterSettingsBase.getMaxTotalNrOfInstances(config),
maxInstancesPerNode = config.getInt("cluster.max-nr-of-instances-per-node"),
allowLocalRoutees = config.getBoolean("cluster.allow-local-routees"),
useRole = ClusterRouterSettingsBase.useRoleOption(config.getString("cluster.use-role")))
@ -105,6 +105,18 @@ private[akka] object ClusterRouterSettingsBase {
case null | "" ⇒ None
case _ ⇒ Some(role)
}
/**
* For backwards compatibility reasons, nr-of-instances
* has the same purpose as max-total-nr-of-instances for cluster
* aware routers and nr-of-instances (if defined by user) takes
* precedence over max-total-nr-of-instances.
*/
def getMaxTotalNrOfInstances(config: Config): Int =
config.getInt("nr-of-instances") match {
case 1 | 0 ⇒ config.getInt("cluster.max-nr-of-instances-per-node")
case other ⇒ other
}
}
/**