You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/22 08:27:33 UTC
[2/3] stratos git commit: implement onChildScalingDownBeyondMinEvent
in super class instead of child classes
implement onChildScalingDownBeyondMinEvent in super class instead of child classes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ba8d1926
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ba8d1926
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ba8d1926
Branch: refs/heads/master
Commit: ba8d19263c745dc4cb1f6fa9c416ec0d2fa77af8
Parents: 9de91b1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Dec 22 11:50:34 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Dec 22 12:59:51 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/component/ApplicationMonitor.java | 6 ------
.../stratos/autoscaler/monitor/component/GroupMonitor.java | 5 -----
.../autoscaler/monitor/component/ParentComponentMonitor.java | 8 +++++++-
3 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ba8d1926/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
index 33c79f2..73e2f6c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
@@ -130,12 +130,6 @@ public class ApplicationMonitor extends ParentComponentMonitor {
monitoringRunnable.run();
}
- @Override
- public void onChildScalingDownBeyondMinEvent(ScalingDownBeyondMinEvent scalingDownBeyondMinEvent) {
-
- }
-
-
/**
* Find the group monitor by traversing recursively in the hierarchical monitors.
*
http://git-wip-us.apache.org/repos/asf/stratos/blob/ba8d1926/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 5bb8aab..36c463b 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
@@ -190,11 +190,6 @@ public class GroupMonitor extends ParentComponentMonitor {
monitoringRunnable.run();
}
- @Override
- public void onChildScalingDownBeyondMinEvent(ScalingDownBeyondMinEvent scalingDownBeyondMinEvent) {
-
- }
-
/**
* Will set the status of the monitor based on Topology Group status/child status like scaling
*
http://git-wip-us.apache.org/repos/asf/stratos/blob/ba8d1926/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 73766e2..cc36146 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
@@ -772,7 +772,13 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable
return scalingDependencies;
}
- public abstract void onChildScalingDownBeyondMinEvent(ScalingDownBeyondMinEvent scalingDownBeyondMinEvent);
+ public void onChildScalingDownBeyondMinEvent(ScalingDownBeyondMinEvent scalingDownBeyondMinEvent){
+
+ String networkPartitionId = scalingDownBeyondMinEvent.getNetworkPartitionId();
+ String instanceId = scalingDownBeyondMinEvent.getInstanceId();
+ getNetworkPartitionContext(networkPartitionId).getInstanceContext(instanceId).
+ addScalingDownBeyondMinEvent(scalingDownBeyondMinEvent);
+ }
private class MonitorAdder implements Runnable {
private ApplicationChildContext context;