Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 5a171c559 -> 255087dda
fixing terminating issues Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/255087dd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/255087dd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/255087dd Branch: refs/heads/4.0.0-grouping Commit: 255087ddae1b984ef40ad705e8caa5cf62b11c13 Parents: 5a171c5 Author: reka <[email protected]> Authored: Thu Oct 30 16:07:02 2014 +0530 Committer: reka <[email protected]> Committed: Thu Oct 30 16:07:02 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/application/ApplicationMonitor.java | 8 ++++---- .../stratos/autoscaler/monitor/group/GroupMonitor.java | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/255087dd/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 6256c02..4632361 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 @@ -162,7 +162,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { } else if (status1 == ClusterStatus.Inactive || status1 == GroupStatus.Inactive) { onChildInActiveEvent(id); - } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminated) { + } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { //mark the child monitor as inActive in the map this.markMonitorAsInactive(id); @@ -174,11 +174,11 @@ public class ApplicationMonitor extends ParentComponentMonitor { log.warn("[monitor] " + id + " cannot be found in the inActive monitors list"); } - if (this.status != ApplicationStatus.Terminating || this.status != ApplicationStatus.Terminated) { - onChildTerminatedEvent(id); - } else { + if (this.status == ApplicationStatus.Terminating || this.status == ApplicationStatus.Terminated) { StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId); log.info("Executing the un-subscription request for the [monitor] " + id); + } else { + onChildTerminatedEvent(id); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/255087dd/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 a9aeb57..4a789bf 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 @@ -73,7 +73,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler } else if (status1 == ClusterStatus.Inactive || status1 == GroupStatus.Inactive) { onChildInActiveEvent(id); - } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminated) { + } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { //mark the child monitor as inActive in the map this.markMonitorAsInactive(id); @@ -85,11 +85,12 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler log.warn("[monitor] " + id + " cannot be found in the inActive monitors list"); } - if (this.status != GroupStatus.Terminating || this.status != GroupStatus.Terminated) { - onChildTerminatedEvent(id); - } else { + if (this.status == GroupStatus.Terminating || this.status == GroupStatus.Terminated) { StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId); log.info("Executing the un-subscription request for the [monitor] " + id); + } else { + onChildTerminatedEvent(id); + } }
