You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/03/11 07:59:30 UTC
git commit: removing some duplicated code to a super class
Repository: incubator-stratos
Updated Branches:
refs/heads/master 75d74703e -> 8d4cf7cca
removing some duplicated code to a super class
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8d4cf7cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8d4cf7cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8d4cf7cc
Branch: refs/heads/master
Commit: 8d4cf7ccad9b26265241faf45c6a5509c6ce5ab0
Parents: 75d7470
Author: Isuru <is...@wso2.com>
Authored: Tue Mar 11 12:29:16 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Tue Mar 11 12:29:16 2014 +0530
----------------------------------------------------------------------
.../behaviour/CartridgeMgtBehaviour.java | 21 +++++++++++++++++++-
.../SubscriptionSingleTenantBehaviour.java | 8 ++------
2 files changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8d4cf7cc/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
index 92633c8..6a159da 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/behaviour/CartridgeMgtBehaviour.java
@@ -34,6 +34,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;
@@ -121,7 +122,7 @@ public abstract class CartridgeMgtBehaviour implements Serializable {
public void remove(String clusterId, String alias) throws ADCException, NotSubscribedException {
- try {
+ /*try {
CloudControllerServiceClient.getServiceClient().terminateAllInstances(clusterId);
} catch (AxisFault e) {
@@ -146,6 +147,24 @@ public abstract class CartridgeMgtBehaviour implements Serializable {
throw new ADCException(errorMsg, e);
}
+ log.info("Unregistered service cluster, domain " + clusterId);*/
+
+ //sending instance cleanup notification for the cluster, so that members in the cluster would aware of the termination
+ // and perform the house keeping task.
+
+ new InstanceCleanupNotificationService().sendInstanceCleanupNotificationForCluster(clusterId);
+
+ log.info("Instance Cleanup Notification sent to Cluster: " + clusterId);
+
+ try {
+ CloudControllerServiceClient.getServiceClient().unregisterService(clusterId);
+
+ } catch (Exception e) {
+ String errorMsg = "Error in unregistering service cluster with domain " + clusterId;
+ log.error(errorMsg);
+ throw new ADCException(errorMsg, e);
+ }
+
log.info("Unregistered service cluster, domain " + clusterId);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8d4cf7cc/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 1b6099a..e87b7d8 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
@@ -21,10 +21,6 @@ package org.apache.stratos.manager.subscription.tenancy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.manager.client.CloudControllerServiceClient;
-import org.apache.stratos.manager.exception.ADCException;
-import org.apache.stratos.manager.exception.NotSubscribedException;
-import org.apache.stratos.manager.service.InstanceCleanupNotificationService;
public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehaviour {
@@ -99,7 +95,7 @@ public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehavi
properties);
}*/
- public void remove (String clusterId, String alias) throws ADCException, NotSubscribedException {
+ /*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.
@@ -117,5 +113,5 @@ public class SubscriptionSingleTenantBehaviour extends SubscriptionTenancyBehavi
}
log.info("Unregistered service cluster, domain " + clusterId);
- }
+ }*/
}