removnig inactive restart handling as it causes issue in the actual inactive case for monitors
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5a49d49b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5a49d49b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5a49d49b Branch: refs/heads/4.1.0-test Commit: 5a49d49bb2a58e34375a3f1600cc8217417ed965 Parents: 56dd783 Author: reka <[email protected]> Authored: Fri Dec 12 01:41:48 2014 +0530 Committer: reka <[email protected]> Committed: Fri Dec 12 10:20:47 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/monitor/component/GroupMonitor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5a49d49b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java index e13cef4..2baba68 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java @@ -185,13 +185,13 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable { onChildActivatedEvent(childId, instanceId); } else if (status1 == ClusterStatus.Inactive || status1 == GroupStatus.Inactive) { - //handling restart of stratos - if (!aliasToActiveMonitorsMap.get(childId).hasStartupDependents()) { + //TODO handling restart of stratos + /*if (!aliasToActiveMonitorsMap.get(childId).hasStartupDependents()) { onChildActivatedEvent(childId, instanceId); - } else { + } else {*/ markInstanceAsInactive(childId, instanceId); onChildInactiveEvent(childId, instanceId); - } + //} } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { //mark the child monitor as inactive in the map
