Updated Branches: refs/heads/master 403813c2a -> 0c012936e
LB cluster monitor fix Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0c012936 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0c012936 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0c012936 Branch: refs/heads/master Commit: 0c012936e1f548128863aa7d6f1f67c8b99eb4b6 Parents: 403813c Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 18 16:35:15 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 18 16:35:15 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/monitor/LbClusterMonitor.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c012936/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java index 2cf794a..72a7ddc 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java @@ -20,7 +20,6 @@ package org.apache.stratos.autoscaler.monitor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.AutoscalerContext; import org.apache.stratos.autoscaler.NetworkPartitionContext; import org.apache.stratos.autoscaler.PartitionContext; import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; @@ -57,7 +56,7 @@ public class LbClusterMonitor extends AbstractMonitor{ private AutoscalePolicy autoscalePolicy; // Key- MemberId Value- partitionId - private Map<String, String> memberPartitionMap; +// private Map<String, String> memberPartitionMap; private FactHandle minCheckFactHandle; private FactHandle scaleCheckFactHandle; @@ -218,7 +217,14 @@ public class LbClusterMonitor extends AbstractMonitor{ } public String getPartitionOfMember(String memberId){ - return this.memberPartitionMap.get(memberId); + for(Service service: TopologyManager.getTopology().getServices()){ + for(Cluster cluster: service.getClusters()){ + if(cluster.memberExists(memberId)){ + cluster.getMember(memberId).getPartitionId(); + } + } + } + return null; } @Override
