fixing group termination issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/92b467cb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/92b467cb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/92b467cb Branch: refs/heads/4.1.0-test Commit: 92b467cbca98568f38b6119bdacd3915785f0aa8 Parents: 253c2d0 Author: reka <[email protected]> Authored: Tue Dec 9 11:29:28 2014 +0530 Committer: reka <[email protected]> Committed: Tue Dec 9 11:29:28 2014 +0530 ---------------------------------------------------------------------- .../applications/topic/ApplicationBuilder.java | 12 ++++++------ .../autoscaler/monitor/cluster/VMClusterMonitor.java | 3 ++- .../monitor/component/ParentComponentMonitor.java | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/92b467cb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java index 956d6d2..9463906 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java @@ -327,7 +327,7 @@ public class ApplicationBuilder { Group group = application.getGroupRecursively(groupId); if (group == null) { - log.warn(String.format("Group does not exist: [group-id] %s", + log.warn(String.format("Group does not exist: [group-id] %s when terminated group", groupId)); return; } @@ -371,7 +371,7 @@ public class ApplicationBuilder { Group group = application.getGroupRecursively(groupId); if (group == null) { - log.warn(String.format("Group does not exist: [group-id] %s", + log.warn(String.format("Group does not exist: [group-id] %s when activating group", groupId)); return; } @@ -414,7 +414,7 @@ public class ApplicationBuilder { Group group = application.getGroupRecursively(groupId); if (group == null) { - log.warn(String.format("Group %s does not exist", + log.warn(String.format("Group %s does not exist when instance creating group ", groupId)); return; } @@ -454,7 +454,7 @@ public class ApplicationBuilder { Group group = application.getGroupRecursively(groupId); if (group == null) { - log.warn(String.format("Group %s does not exist", + log.warn(String.format("Group %s does not exist when creating group", groupId)); return instance; } @@ -502,7 +502,7 @@ public class ApplicationBuilder { Group group = application.getGroupRecursively(groupId); if (group == null) { - log.warn(String.format("Group does not exist: [group-id] %s", + log.warn(String.format("Group does not exist: [group-id] %s when inactive group", groupId)); return; } @@ -545,7 +545,7 @@ public class ApplicationBuilder { Group group = application.getGroupRecursively(groupId); if (group == null) { - log.warn(String.format("Group does not exist: [group-id] %s", + log.warn(String.format("Group does not exist: [group-id] %s when terminating group", groupId)); return; } http://git-wip-us.apache.org/repos/asf/stratos/blob/92b467cb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java index a43f89e..7b56e9a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java @@ -190,7 +190,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { ClusterInstance instance = (ClusterInstance) this.instanceIdToInstanceMap. get(instanceContext.getId()); if ((instance.getStatus().getCode() <= ClusterStatus.Active.getCode()) || - (instance.getStatus() == ClusterStatus.Inactive && !hasStartupDependents) && !this.hasFaultyMember + (instance.getStatus() == ClusterStatus.Inactive && !hasStartupDependents) + && !this.hasFaultyMember && !stop) { Runnable monitoringRunnable = new Runnable() { http://git-wip-us.apache.org/repos/asf/stratos/blob/92b467cb/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 61fbf11..413df51 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 @@ -289,7 +289,7 @@ public abstract class ParentComponentMonitor extends Monitor { //handling the killall scenario if (this.parent != null) { //send terminating to the parent. So that it will push terminating to its children - ApplicationBuilder.handleGroupTerminatingEvent(this.appId, childId, instanceId); + ApplicationBuilder.handleGroupTerminatingEvent(this.appId, this.id, instanceId); } else { //if it is an application, send terminating event individually for children sendTerminatingEventOnNotification(terminationList, childId, true, instanceId);
