Repository: stratos Updated Branches: refs/heads/master 9b61f3f74 -> 83a4f083c
monitor needs to be terminating only in the undeployment Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/83a4f083 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/83a4f083 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/83a4f083 Branch: refs/heads/master Commit: 83a4f083ce6fd5f57ec765f4c1153263784f8d2f Parents: 3d82037 Author: reka <[email protected]> Authored: Wed May 13 22:32:29 2015 +0530 Committer: reka <[email protected]> Committed: Wed May 13 22:41:09 2015 +0530 ---------------------------------------------------------------------- .../applications/topic/ApplicationBuilder.java | 2 -- .../services/impl/AutoscalerServiceImpl.java | 18 +++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/83a4f083/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 91b8b74..b0315b1 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 @@ -661,8 +661,6 @@ public class ApplicationBuilder { } context.movePendingInstanceToActiveInstances(instanceId); } else if (status == ApplicationStatus.Terminating) { - applicationMonitor.setTerminating(true); - if (context.getActiveInstance(instanceId) != null) { if (log.isDebugEnabled()) { log.debug("Moving active [application-instance] " + instanceId + http://git-wip-us.apache.org/repos/asf/stratos/blob/83a4f083/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index 4d2e3bf..5ef8e90 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -467,28 +467,32 @@ public class AutoscalerServiceImpl implements AutoscalerService { return false; } if (!force) { - // Gracefull undeployment flow + // Graceful un-deployment flow if (appMonitor.isTerminating()) { - log.info("Application monitor is already in terminating, graceful undeployment is has already been attempted thus not invoking again"); + log.info("Application monitor is already in terminating, graceful " + + "un-deployment is has already been attempted thus not invoking again"); return false; } else { - log.info(String.format("Gracefully undeploying the application " + applicationId)); + log.info(String.format("Gracefully un-deploying the application " + applicationId)); + appMonitor.setTerminating(true); undeployApplicationGracefully(applicationId); } } else { - // force undeployment flow + // force un-deployment flow if (appMonitor.isTerminating()) { if (appMonitor.isForce()) { - log.warn("Force undeployment is already in progress, hence not invoking again"); + log.warn("Force un-deployment is already in progress, hence not invoking again"); return false; } else { - log.info(String.format("Previous gracefull undeployment is in progress for [application-id] %s , thus terminating instances directly", applicationId)); + log.info(String.format("Previous graceful un-deployment is in progress for " + + "[application-id] %s , thus terminating instances directly", applicationId)); appMonitor.setForce(true); terminateAllApplicationMembersForcefully(applicationId); } } else { - log.info(String.format("Forcefully undeploying the application " + applicationId)); + log.info(String.format("Forcefully un-deploying the application " + applicationId)); + appMonitor.setTerminating(true); appMonitor.setForce(true); undeployApplicationGracefully(applicationId); }
