Repository: incubator-stratos Updated Branches: refs/heads/master 4abba97e2 -> a44262aef
instance cleanup notification added to the unsubscription Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6c3231c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6c3231c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6c3231c4 Branch: refs/heads/master Commit: 6c3231c499901ec006b985eab43e534a0a252f85 Parents: 5d0796a Author: rekathiru <[email protected]> Authored: Mon Feb 17 18:04:06 2014 +0530 Committer: rekathiru <[email protected]> Committed: Mon Feb 17 18:04:06 2014 +0530 ---------------------------------------------------------------------- .../SubscriptionSingleTenantBehaviour.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6c3231c4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java index 95edc25..e3c2772 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/tenancy/SubscriptionSingleTenantBehaviour.java @@ -35,6 +35,7 @@ import org.apache.stratos.manager.payload.BasicPayloadData; import org.apache.stratos.manager.payload.PayloadData; import org.apache.stratos.manager.payload.PayloadFactory; import org.apache.stratos.manager.repository.Repository; +import org.apache.stratos.manager.service.InstanceCleanupNotificationService; import org.apache.stratos.manager.subscriber.Subscriber; import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils; import org.apache.stratos.manager.utils.ApplicationManagementUtil; @@ -117,22 +118,12 @@ public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehavi } public void remove (String clusterId, String alias) throws ADCException, NotSubscribedException { + //sending instance cleanup notification for the cluster, so that members in the cluster would aware of the termination + // and perform the house keeping task. - try { - CloudControllerServiceClient.getServiceClient().terminateAllInstances(clusterId); - - } catch (AxisFault e) { - String errorMsg = "Error in terminating cartridge subscription, alias " + alias; - log.error(errorMsg); - throw new ADCException(errorMsg, e); - - } catch (Exception e) { - String errorMsg = "Error in terminating cartridge subscription, alias " + alias; - log.error(errorMsg); - throw new ADCException(errorMsg, e); - } + new InstanceCleanupNotificationService().sendInstanceCleanupNotificationForCluster(clusterId); - log.info("Terminated all instances of " + clusterId); + log.info("Instance Cleanup Notification sent to Cluster: " + clusterId); try { CloudControllerServiceClient.getServiceClient().unregisterService(clusterId);
