Repository: stratos Updated Branches: refs/heads/4.0.0-grouping b9f7ea275 -> fa17eee73
fixing cluster monitor issue Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fa17eee7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fa17eee7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fa17eee7 Branch: refs/heads/4.0.0-grouping Commit: fa17eee7335daf4a7d65ab7ec0f4328df05a2ebe Parents: 2720204 Author: reka <[email protected]> Authored: Wed Oct 22 15:21:36 2014 +0530 Committer: reka <[email protected]> Committed: Wed Oct 22 15:21:46 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/ApplicationMonitorFactory.java | 14 ++++++++------ .../autoscaler/monitor/ParentComponentMonitor.java | 2 -- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fa17eee7/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java index 6d8f2a3..fc22388 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java @@ -20,6 +20,7 @@ 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.MemberStatsContext; import org.apache.stratos.autoscaler.NetworkPartitionContext; import org.apache.stratos.autoscaler.PartitionContext; @@ -277,11 +278,6 @@ public class ApplicationMonitorFactory { } } - if (cluster.hasMembers()) { - //triggering the status checker if cluster has members to decide - // on the current status of the cluster - StatusChecker.getInstance().onMemberStatusChange(clusterId); - } networkPartitionContext.addPartitionContext(partitionContext); if (log.isInfoEnabled()) { log.info(String.format("Partition context has been added: [partition] %s", @@ -294,7 +290,7 @@ public class ApplicationMonitorFactory { if(!parentMonitor.isHasDependent() && !context.hasChild()) { clusterMonitor.setHasDependent(true); } - //clusterMonitor.setCurrentStatus(Status.Created); + AutoscalerContext.getInstance().addMonitor(clusterMonitor); if (log.isInfoEnabled()) { log.info(String.format("Network partition context has been added: [network partition] %s", networkPartitionContext.getId())); @@ -306,6 +302,12 @@ public class ApplicationMonitorFactory { //updating the status, so that it will notify the parent clusterMonitor.setStatus(cluster.getStatus()); } + + if (!cluster.hasMembers()) { + //triggering the status checker if cluster has members to decide + // on the current status of the cluster + StatusChecker.getInstance().onMemberStatusChange(clusterId); + } } finally { //release read lock for the service and cluster TopologyManager.releaseReadLockForCluster(serviceName, clusterId); http://git-wip-us.apache.org/repos/asf/stratos/blob/fa17eee7/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java index 5bfb542..7e74809 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java @@ -350,8 +350,6 @@ public abstract class ParentComponentMonitor extends Monitor { //TODO parent.notify(); throw new RuntimeException(msg); } - - AutoscalerContext.getInstance().addMonitor(monitor); aliasToActiveMonitorsMap.put(context.getId(), monitor); if (log.isInfoEnabled()) { log.info(String.format("Monitor has been added successfully for: %s",
