Repository: stratos Updated Branches: refs/heads/master c98223409 -> 2d848cb5c
Notify parent if the groups has scaling dependents Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2d848cb5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2d848cb5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2d848cb5 Branch: refs/heads/master Commit: 2d848cb5ca38a66bf7323b2a35daa3ac5309e8d3 Parents: c982234 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Nov 25 23:53:10 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Nov 25 23:53:10 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/autoscaler/monitor/Monitor.java | 2 +- .../monitor/application/ApplicationMonitorFactory.java | 5 ++--- .../apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2d848cb5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java index 31276c1..7413d50 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java @@ -102,7 +102,7 @@ public abstract class Monitor implements EventHandler { * * @return startup dependencies exist or not */ - public boolean isHasGroupScalingDependent() { + public boolean hasGroupScalingDependent() { return hasGroupScalingDependent; } http://git-wip-us.apache.org/repos/asf/stratos/blob/2d848cb5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java index c3cbc62..73f274d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitorFactory.java @@ -32,7 +32,6 @@ import org.apache.stratos.autoscaler.monitor.ParentComponentMonitor; import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor; import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitorFactory; import org.apache.stratos.autoscaler.monitor.group.GroupMonitor; -import org.apache.stratos.autoscaler.status.checker.StatusChecker; import org.apache.stratos.messaging.domain.applications.Application; import org.apache.stratos.messaging.domain.applications.Group; import org.apache.stratos.messaging.domain.topology.Cluster; @@ -112,7 +111,7 @@ public class ApplicationMonitorFactory { groupMonitor.setGroupScalingEnabled(true); } else if(parentMonitor instanceof GroupMonitor) { if(((GroupMonitor)parentMonitor).isGroupScalingEnabled() || - parentMonitor.isHasGroupScalingDependent()) { + parentMonitor.hasGroupScalingDependent()) { groupMonitor.setHasGroupScalingDependent(true); } } @@ -216,7 +215,7 @@ public class ApplicationMonitorFactory { } //setting the scaling dependent behaviour of the cluster monitor - if(parentMonitor.isHasGroupScalingDependent() || (context.isGroupScalingEnabled())) { + if(parentMonitor.hasGroupScalingDependent() || (context.isGroupScalingEnabled())) { clusterMonitor.setHasGroupScalingDependent(true); } else { clusterMonitor.setHasGroupScalingDependent(false); http://git-wip-us.apache.org/repos/asf/stratos/blob/2d848cb5/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 837ca77..ac1deb4 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 @@ -171,6 +171,11 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler @Override public void onChildScalingEvent(MonitorScalingEvent scalingEvent) { + if(hasGroupScalingDependent){ + + //notify parent + parent.onChildScalingEvent(scalingEvent); + } if(log.isDebugEnabled()){ log.debug("Child scaling event received to [group]: " + this.getId()
