Handling KubernetesClusterAlreadyExistsException to handle specific error
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/09fa76ed Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/09fa76ed Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/09fa76ed Branch: refs/heads/master Commit: 09fa76ed7a7cbd116d7f2b9b006e9a7a822630b4 Parents: 179208f Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Apr 29 23:03:02 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Apr 29 23:05:18 2015 +0530 ---------------------------------------------------------------------- ...KubernetesClusterAlreadyExistsException.java | 49 ++++++++++++++++++++ .../services/CloudControllerService.java | 2 +- .../impl/CloudControllerServiceImpl.java | 18 +++++-- 3 files changed, 64 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/09fa76ed/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesClusterAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesClusterAlreadyExistsException.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesClusterAlreadyExistsException.java new file mode 100644 index 0000000..607587e --- /dev/null +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/exception/KubernetesClusterAlreadyExistsException.java @@ -0,0 +1,49 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +package org.apache.stratos.cloud.controller.exception; + +/** + * Exception class for handling invalid Kubernetes cluster + */ +public class KubernetesClusterAlreadyExistsException extends Exception { + + private String message; + + public KubernetesClusterAlreadyExistsException(String message, Exception exception) { + super(message, exception); + this.message = message; + } + + public KubernetesClusterAlreadyExistsException(Exception exception) { + super(exception); + } + + public KubernetesClusterAlreadyExistsException(String msg) { + super(msg); + this.message = msg; + } + + @Override + public String getMessage() { + return this.message; + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/09fa76ed/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 d43f78c..7f37eda 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 @@ -291,7 +291,7 @@ public interface CloudControllerService { * @param kubernetesCluster * @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesClusterException */ - public boolean addKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException; + public boolean addKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException, KubernetesClusterAlreadyExistsException; /** * Add a Kubernetes host to a Kubernetes cluster. http://git-wip-us.apache.org/repos/asf/stratos/blob/09fa76ed/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 200852b..eee1f1c 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 @@ -1162,27 +1162,37 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public KubernetesCluster getKubernetesCluster(String kubernetesClusterId) throws NonExistingKubernetesClusterException { + public KubernetesCluster getKubernetesCluster(String kubernetesClusterId) throws + NonExistingKubernetesClusterException { return CloudControllerContext.getInstance().getKubernetesCluster(kubernetesClusterId); } @Override - public KubernetesMaster getMasterForKubernetesCluster(String kubernetesClusterId) throws NonExistingKubernetesClusterException { + public KubernetesMaster getMasterForKubernetesCluster(String kubernetesClusterId) throws + NonExistingKubernetesClusterException { return CloudControllerContext.getInstance().getKubernetesMasterInGroup(kubernetesClusterId); } @Override - public KubernetesHost[] getHostsForKubernetesCluster(String kubernetesClusterId) throws NonExistingKubernetesClusterException { + public KubernetesHost[] getHostsForKubernetesCluster(String kubernetesClusterId) throws + NonExistingKubernetesClusterException { return CloudControllerContext.getInstance().getKubernetesHostsInGroup(kubernetesClusterId); } @Override - public boolean addKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException { + public boolean addKubernetesCluster(KubernetesCluster kubernetesCluster) throws InvalidKubernetesClusterException, + KubernetesClusterAlreadyExistsException { if (kubernetesCluster == null) { throw new InvalidKubernetesClusterException("Kubernetes cluster can not be null"); } + try { + if(CloudControllerContext.getInstance().getKubernetesCluster(kubernetesCluster.getClusterId()) != null){ + throw new KubernetesClusterAlreadyExistsException("Kubernetes cluster already exists"); + } + } catch (NonExistingKubernetesClusterException ignore) { + } Lock lock = null; try { lock = CloudControllerContext.getInstance().acquireKubernetesClusterWriteLock();
