You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/07 20:55:19 UTC
[2/5] stratos git commit: Make removeKubernetesCluster return void
Make removeKubernetesCluster return void
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d607a322
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d607a322
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d607a322
Branch: refs/heads/master
Commit: d607a3227b313132da2c738a8a646187b2f30961
Parents: 98f667c
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu May 7 14:45:01 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 8 00:15:50 2015 +0530
----------------------------------------------------------------------
.../services/CloudControllerService.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 23 ++++++++++----------
2 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d607a322/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
index 7f37eda..b38fdb7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
@@ -320,7 +320,7 @@ public interface CloudControllerService {
* @param groupId
* @throws NonExistingKubernetesClusterException
*/
- public boolean removeKubernetesCluster(String groupId) throws NonExistingKubernetesClusterException;
+ public void removeKubernetesCluster(String groupId) throws NonExistingKubernetesClusterException;
/**
* Update a Kubernetes host.
http://git-wip-us.apache.org/repos/asf/stratos/blob/d607a322/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 9c21268..97c0ec0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -1276,11 +1276,15 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
@Override
- public boolean removeKubernetesCluster(String kubernetesClusterId) throws NonExistingKubernetesClusterException {
+ public void removeKubernetesCluster(String kubernetesClusterId) throws NonExistingKubernetesClusterException {
if (StringUtils.isEmpty(kubernetesClusterId)) {
throw new NonExistingKubernetesClusterException("Kubernetes cluster id can not be empty");
}
+ if(null == CloudControllerContext.getInstance().getKubernetesCluster(kubernetesClusterId)){
+ throw new NonExistingKubernetesClusterException("Kubernetes cluster not found, [kubernetes-cluster] "
+ + kubernetesClusterId);
+ }
Lock lock = null;
try {
lock = CloudControllerContext.getInstance().acquireKubernetesClusterWriteLock();
@@ -1288,20 +1292,15 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (log.isInfoEnabled()) {
log.info("Removing Kubernetes cluster: " + kubernetesClusterId);
}
- try {
- // Remove entry from information model
- CloudControllerContext.getInstance().removeKubernetesCluster(kubernetesClusterId);
+ // Remove entry from information model
+ CloudControllerContext.getInstance().removeKubernetesCluster(kubernetesClusterId);
- if (log.isInfoEnabled()) {
- log.info(String.format("Kubernetes cluster removed successfully: [id] %s", kubernetesClusterId));
- }
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Kubernetes cluster removed successfully: [id] %s", kubernetesClusterId));
+ }
- CloudControllerContext.getInstance().persist();
+ CloudControllerContext.getInstance().persist();
- return true;
- } catch (Exception e) {
- throw new NonExistingKubernetesClusterException(e.getMessage(), e);
- }
} finally {
if (lock != null) {
CloudControllerContext.getInstance().releaseWriteLock(lock);