Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 30a666571 -> f6c0cfcb5
fixing a build error due to wrong Status Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f6c0cfcb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f6c0cfcb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f6c0cfcb Branch: refs/heads/4.0.0-grouping Commit: f6c0cfcb5e66912ca92a296d0ade55b2c5d08d64 Parents: 30a6665 Author: Isuru Haththotuwa <[email protected]> Authored: Sat Oct 18 10:15:09 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Sat Oct 18 10:15:09 2014 +0530 ---------------------------------------------------------------------- .../message/receiver/topology/AutoscalerTopologyEventReceiver.java | 2 +- .../org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f6c0cfcb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java index 1e20937..5b765d4 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java @@ -306,7 +306,7 @@ public class AutoscalerTopologyEventReceiver implements Runnable { AbstractClusterMonitor monitor; if (AutoscalerContext.getInstance().monitorExist((cluster.getClusterId()))) { monitor = (AbstractClusterMonitor) AutoscalerContext.getInstance().getMonitor(clusterMaitenanceEvent.getClusterId()); - monitor.setStatus(Status.In_Active); + monitor.setStatus(Status.In_Maintenance); } else if (AutoscalerContext.getInstance(). lbMonitorExist((cluster.getClusterId()))) { AutoscalerContext.getInstance().getLBMonitor(clusterMaitenanceEvent.getClusterId()). http://git-wip-us.apache.org/repos/asf/stratos/blob/f6c0cfcb/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 619d13e..c76f02b 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 @@ -102,7 +102,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler //TODO revert the siblings and notify parent, change a flag for reverting/un-subscription log.error(e); } - } else if(status1 == Status.In_Active) { + } else if(status1 == Status.In_Maintenance) { //TODO if C1 depends on C2, then if C2 is in_active, then by getting killdepend as C1 and //TODO need to send in_active for c1. When C1 in_active receives, get dependent and //TODO check whether dependent in_active. Then kill c1.
