Repository: stratos Updated Branches: refs/heads/master c0e0a5b4f -> 7c7e97e37
s/handleScalingMaxOut/handleScalingUpBeyondMax and changing log level of debug to info Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7c7e97e3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7c7e97e3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7c7e97e3 Branch: refs/heads/master Commit: 7c7e97e374525e82a457e9e5ca5119e75c1cb65d Parents: c0e0a5b Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Jan 25 21:33:14 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Jan 25 21:33:14 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/component/GroupMonitor.java | 6 +++--- .../monitor/component/ParentComponentMonitor.java | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7c7e97e3/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 1cf4546..aac802f 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 @@ -122,7 +122,7 @@ public class GroupMonitor extends ParentComponentMonitor { //Gives priority to scaling max out rather than dependency scaling if (!instanceContext.getIdToScalingOverMaxEvent().isEmpty()) { //handling the max out of the children - handleScalingMaxOut(instanceContext, networkPartitionContext); + handleScalingUpBeyondMax(instanceContext, networkPartitionContext); } else if (!instanceContext.getIdToScalingEvent().isEmpty()) { //handling the dependent scaling @@ -140,8 +140,8 @@ public class GroupMonitor extends ParentComponentMonitor { executorService.execute(monitoringRunnable); } - private void handleScalingMaxOut(InstanceContext instanceContext, - NetworkPartitionContext networkPartitionContext) { + private void handleScalingUpBeyondMax(InstanceContext instanceContext, + NetworkPartitionContext networkPartitionContext) { if (!hasScalingDependents) { //handling the group scaling and if pending instances found, // reject the max http://git-wip-us.apache.org/repos/asf/stratos/blob/7c7e97e3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java index 5cc72b0..14df03b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java @@ -626,12 +626,11 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable networkPartitionContext.getId(), instanceContext.getId(), highestScalingEventOfChild.getFactor()); - if (log.isDebugEnabled()) { - log.debug("Notifying the [child] " + scalingEvent.getId() + - " [instance] " + scalingEvent.getInstanceId() + - " with the highest [factor] " + scalingEvent.getFactor() + - " upon decision of dependent scaling"); - } + + log.info("Notifying the [child] " + scalingEvent.getId() + " [instance] " + + scalingEvent.getInstanceId() + " with the highest [factor] " + + scalingEvent.getFactor() + " upon decision of dependent scaling"); + monitor.onParentScalingEvent(scalingEvent); } }
