Updated Branches: refs/heads/master 9831acb33 -> c13864da9
adding instance notification instead of termination when scale down Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c13864da Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c13864da Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c13864da Branch: refs/heads/master Commit: c13864da97c4251402cca3156db04542c1058384 Parents: 9831acb Author: rekathiru <[email protected]> Authored: Fri Jan 10 15:27:31 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 10 15:27:31 2014 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/stratos/autoscaler/Constants.java | 8 ++------ .../apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 6 ++++-- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c13864da/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java index ae351a7..56d2e2b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java @@ -20,12 +20,8 @@ public class Constants { public static final String STRATOS_MANAGER_SERVICE_SFX = "services/InstanceCleanupNotificationService"; public static final int STRATOS_MANAGER_DEFAULT_PORT = 9444; - public static final String STRATOS_MANAGER_HOSTNAME_ELEMENT = "stratos.manager.hostname"; - public static final String STRATOS_MANAGER_DEFAULT_PORT_ELEMENT = "stratos.manager.port"; - - - - + public static final String STRATOS_MANAGER_HOSTNAME_ELEMENT = "autoscaler.stratosManager.hostname"; + public static final String STRATOS_MANAGER_DEFAULT_PORT_ELEMENT = "autoscaler.stratosManager.port"; // partition properties public static final String REGION_PROPERTY = "region"; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c13864da/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index 68da7b1..46c6ad0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -9,6 +9,7 @@ import org.apache.stratos.autoscaler.algorithm.AutoscaleAlgorithm; import org.apache.stratos.autoscaler.algorithm.OneAfterAnother; import org.apache.stratos.autoscaler.algorithm.RoundRobin; import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClient; +import org.apache.stratos.autoscaler.client.cloud.controller.InstanceNotificationClient; import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.cloud.controller.deployment.partition.Partition; import org.apache.stratos.cloud.controller.pojo.MemberContext; @@ -110,8 +111,9 @@ public class RuleTasksDelegator { public void delegateTerminate(String memberId) { try { - - CloudControllerClient.getInstance().terminate(memberId); + //calling SM to send the instance notification event. + InstanceNotificationClient.getInstance().sendMemberCleanupEvent(memberId); + //CloudControllerClient.getInstance().terminate(memberId); } catch (Throwable e) { log.error("Cannot terminate instance", e); }
