Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 478ed8df4 -> f34747c87
adding empty check to queue Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4f33da65 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4f33da65 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4f33da65 Branch: refs/heads/4.0.0-grouping Commit: 4f33da653e2323ce974a6a83da489d2a1ff778e6 Parents: daa1894 Author: reka <[email protected]> Authored: Thu Sep 25 18:07:29 2014 +0530 Committer: reka <[email protected]> Committed: Thu Sep 25 18:07:29 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/application/ApplicationMonitor.java | 4 +++- .../apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 4 +++- .../stratos/autoscaler/status/checker/StatusChecker.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4f33da65/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java index c517868..09921de 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java @@ -54,7 +54,9 @@ public class ApplicationMonitor extends Monitor { "on its state change from %s to %s", id, notifier, this.status, status)); if(childStatus == Status.Activated) { //start the next dependency - startDependency(); + if(!preOrderTraverse.isEmpty()) { + startDependency(); + } } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/4f33da65/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java index 8fa20f1..aa17b1e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java @@ -60,7 +60,9 @@ public class GroupMonitor extends Monitor { "on its state change from %s to %s", id, notifier, this.status, status)); if(childStatus == Status.Activated) { //start the next dependency - startDependency(); + if(!preOrderTraverse.isEmpty()) { + startDependency(); + } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/4f33da65/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java index cecd09a..06d24ae 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java @@ -158,8 +158,8 @@ public class StatusChecker { private boolean updateChildStatus(String appId, String id, Map<String, Group> groups, Map<String, ClusterDataHolder> clusterData, ParentBehavior parent) { boolean groupActive = false; - boolean clustersActive = false; - boolean groupsActive = false; + boolean clustersActive; + boolean groupsActive; boolean childFound = false; if (clusterData.containsValue(id) || groups.containsKey(id)) { @@ -175,7 +175,7 @@ public class StatusChecker { clustersActive = getClusterStatus(clusterData); groupActive = clustersActive; } else { - //TODO warn log + log.warn("Clusters/groups not found in this [component] "+ appId); } //send the activation event if (parent instanceof Application && groupActive) {
