You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/10/30 06:56:09 UTC
git commit: fixing sending inActive events twice from autoscaler
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping 8047060a5 -> 304aa6c83
fixing sending inActive events twice from autoscaler
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/304aa6c8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/304aa6c8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/304aa6c8
Branch: refs/heads/4.0.0-grouping
Commit: 304aa6c834834f12c265faaf17268d46558b8eb5
Parents: 8047060
Author: reka <rt...@gmail.com>
Authored: Thu Oct 30 11:25:58 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Oct 30 11:25:58 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/application/ApplicationMonitor.java | 5 -----
.../apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 6 ------
2 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/304aa6c8/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 2bf85a6..e7e3238 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
@@ -161,11 +161,6 @@ public class ApplicationMonitor extends ParentComponentMonitor {
} else if (status1 == ClusterStatus.Inactive || status1 == GroupStatus.Inactive) {
onChildInActiveEvent(id);
- //TODO update the status of the Application as in_active when child becomes in_active
-
- /*} else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) {
- onChildTerminatingEvent(id);
- StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId);*/
} else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) {
//Check whether all dependent goes Terminated and then start them in parallel.
http://git-wip-us.apache.org/repos/asf/stratos/blob/304aa6c8/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 01bf148..fc79c59 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
@@ -71,12 +71,6 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler
} else if (status1 == ClusterStatus.Inactive || status1 == GroupStatus.Inactive) {
onChildInActiveEvent(id);
- //To update the status of the Group
- StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId);
-
- /*} else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) {
- //onChildTerminatingEvent(id);
- StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId);*/
} else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) {
//Check whether all dependent goes Terminated and then start them in parallel.