Repository: stratos Updated Branches: refs/heads/master 541452b04 -> 832fe6b89
Making the primary member collection cluster instance wise Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/832fe6b8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/832fe6b8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/832fe6b8 Branch: refs/heads/master Commit: 832fe6b896465bb460e76f8f5295fe03fd2cf434 Parents: 541452b Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Dec 2 12:05:04 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Dec 2 12:05:15 2014 +0530 ---------------------------------------------------------------------- .../monitor/cluster/VMClusterMonitor.java | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/832fe6b8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java index 2a0e5c8..2c2e5bb 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java @@ -168,40 +168,38 @@ public class VMClusterMonitor extends AbstractClusterMonitor { Runnable monitoringRunnable = new Runnable() { @Override public void run() { + for (ClusterLevelNetworkPartitionContext networkPartitionContext : clusterLevelNetworkPartitionContexts) { - // store primary members in the network partition context - List<String> primaryMemberListInNetworkPartition = new ArrayList<String>(); - //minimum check per partition + for (ClusterInstanceContext instanceContext : networkPartitionContext. getClusterInstanceContextMap().values()) { + + // store primary members in the cluster instance context + List<String> primaryMemberListInClusterInstance = new ArrayList<String>(); + //FIXME to check the status of the instance if (true) { - // store primary members in the partition context - List<String> primaryMemberListInPartition = new ArrayList<String>(); - for (ClusterLevelPartitionContext partitionContext : - instanceContext.getPartitionCtxts()) { + + for (ClusterLevelPartitionContext partitionContext : instanceContext.getPartitionCtxts()) { // get active primary members in this partition context for (MemberContext memberContext : partitionContext.getActiveMembers()) { if (isPrimaryMember(memberContext)) { - primaryMemberListInPartition.add(memberContext.getMemberId()); + primaryMemberListInClusterInstance.add(memberContext.getMemberId()); } } // get pending primary members in this partition context for (MemberContext memberContext : partitionContext.getPendingMembers()) { if (isPrimaryMember(memberContext)) { - primaryMemberListInPartition.add(memberContext.getMemberId()); + primaryMemberListInClusterInstance.add(memberContext.getMemberId()); } } } - primaryMemberListInNetworkPartition.addAll(primaryMemberListInPartition); getMinCheckKnowledgeSession().setGlobal("clusterId", getClusterId()); -// getMinCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType); getMinCheckKnowledgeSession().setGlobal("isPrimary", hasPrimary); - getMinCheckKnowledgeSession().setGlobal("instanceId", - instanceContext.getId()); + getMinCheckKnowledgeSession().setGlobal("instanceId", instanceContext.getId()); if (log.isDebugEnabled()) { log.debug(String.format("Running minimum check for cluster instance %s ", @@ -239,11 +237,11 @@ public class VMClusterMonitor extends AbstractClusterMonitor { getScaleCheckKnowledgeSession().setGlobal("laReset", loadAverageReset); // getScaleCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType); getScaleCheckKnowledgeSession().setGlobal("isPrimary", false); - getScaleCheckKnowledgeSession().setGlobal("primaryMembers", primaryMemberListInNetworkPartition); + getScaleCheckKnowledgeSession().setGlobal("primaryMembers", primaryMemberListInClusterInstance); if (log.isDebugEnabled()) { log.debug(String.format("Running scale check for network partition %s ", networkPartitionContext.getId())); - log.debug(" Primary members : " + primaryMemberListInNetworkPartition); + log.debug(" Primary members : " + primaryMemberListInClusterInstance); } scaleCheckFactHandle = AutoscalerRuleEvaluator.evaluateScaleCheck(getScaleCheckKnowledgeSession()
