Adding terminateAllContainers operation in CC client.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/317a2990 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/317a2990 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/317a2990 Branch: refs/heads/master Commit: 317a2990dc3e45ca30f68bef6c33eee6ab25a4c3 Parents: 001caf2 Author: Nirmal Fernando <[email protected]> Authored: Wed Sep 24 19:30:07 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Sep 24 19:31:11 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/CloudControllerClient.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/317a2990/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java index 5d93b40..ec2846a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java @@ -277,13 +277,13 @@ public class CloudControllerClient { } } - public synchronized void terminateContainer(String memberId) throws TerminationException { + public synchronized void terminateAllContainers(String clusterId) throws TerminationException { try { if(log.isInfoEnabled()) { - log.info(String.format("Terminating container via cloud controller: [member] %s", memberId)); + log.info(String.format("Terminating containers via cloud controller: [cluster] %s", clusterId)); } long startTime = System.currentTimeMillis(); - stub.terminateInstance(memberId); + stub.terminateAllContainers(clusterId); if(log.isDebugEnabled()) { long endTime = System.currentTimeMillis(); log.debug(String.format("Service call terminateContainer() returned in %dms", (endTime - startTime))); @@ -292,15 +292,11 @@ public class CloudControllerClient { String msg = e.getMessage(); log.error(msg, e); throw new TerminationException(msg, e); - } catch (CloudControllerServiceInvalidMemberExceptionException e) { - String msg = e.getFaultMessage().getInvalidMemberException().getMessage(); - log.error(msg, e); - throw new TerminationException(msg, e); - } catch (CloudControllerServiceInvalidCartridgeTypeExceptionException e) { - String msg = e.getFaultMessage().getInvalidCartridgeTypeException().getMessage(); + } catch (CloudControllerServiceInvalidClusterExceptionException e) { + String msg = e.getFaultMessage().getInvalidClusterException().getMessage(); log.error(msg, e); throw new TerminationException(msg, e); - } + } } }
