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

Merge pull request #793 from helena/wip-2609-typo-in-clusterRouteeProvider

Browse source 
2609 Typo in method name for ClusterRouteeProvider
This commit is contained in:
Patrik Nordwall 2012-10-10 23:54:18 -07:00
commit b89bfd6ebc
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,7 +196,7 @@ private[akka] class ClusterRouteeProvider(
private def selectDeploymentTarget: Option[Address] = { private def selectDeploymentTarget: Option[Address] = {
val currentRoutees = routees val currentRoutees = routees
val currentNodes = availbleNodes val currentNodes = availableNodes
if (currentNodes.isEmpty || currentRoutees.size >= settings.totalInstances) { if (currentNodes.isEmpty || currentRoutees.size >= settings.totalInstances) {
None None
} else { } else {
@ -222,7 +222,7 @@ private[akka] class ClusterRouteeProvider(
case a ⇒ a case a ⇒ a
} }
private[routing] def availbleNodes: SortedSet[Address] = { private[routing] def availableNodes: SortedSet[Address] = {
import Member.addressOrdering import Member.addressOrdering
val currentNodes = nodes val currentNodes = nodes
if (currentNodes.isEmpty && settings.allowLocalRoutees) if (currentNodes.isEmpty && settings.allowLocalRoutees)
@ -236,11 +236,11 @@ private[akka] class ClusterRouteeProvider(
private[routing] var nodes: SortedSet[Address] = { private[routing] var nodes: SortedSet[Address] = {
import Member.addressOrdering import Member.addressOrdering
cluster.readView.members.collect { cluster.readView.members.collect {
case m if isAvailble(m) ⇒ m.address case m if isAvailable(m) ⇒ m.address
} }
} }
private[routing] def isAvailble(m: Member): Boolean = { private[routing] def isAvailable(m: Member): Boolean = {
m.status == MemberStatus.Up && (settings.allowLocalRoutees || m.address != cluster.selfAddress) m.status == MemberStatus.Up && (settings.allowLocalRoutees || m.address != cluster.selfAddress)
} }
@ -271,10 +271,10 @@ private[akka] class ClusterRouterActor extends Router {
override def routerReceive: Receive = { override def routerReceive: Receive = {
case s: CurrentClusterState ⇒ case s: CurrentClusterState ⇒
import Member.addressOrdering import Member.addressOrdering
routeeProvider.nodes = s.members.collect { case m if routeeProvider.isAvailble(m) ⇒ m.address } routeeProvider.nodes = s.members.collect { case m if routeeProvider.isAvailable(m) ⇒ m.address }
routeeProvider.createRoutees() routeeProvider.createRoutees()
case m: MemberEvent if routeeProvider.isAvailble(m.member) ⇒ case m: MemberEvent if routeeProvider.isAvailable(m.member) ⇒
routeeProvider.nodes += m.member.address routeeProvider.nodes += m.member.address
// createRoutees will create routees based on // createRoutees will create routees based on
// totalInstances and maxInstancesPerNode // totalInstances and maxInstancesPerNode