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/04/07 05:06:35 UTC
[05/20] stratos git commit: Deployment policy move:Remove deployment
policy persistence and util tasks
Deployment policy move:Remove deployment policy persistence and util tasks
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c9940dd0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c9940dd0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c9940dd0
Branch: refs/heads/master
Commit: c9940dd0c3da5ef8cf51c22c53126be9f33353e3
Parents: af2c64c
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Apr 7 07:55:36 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Apr 7 07:55:36 2015 +0530
----------------------------------------------------------------------
.../concurrent/PartitionValidatorCallable.java | 2 +-
.../context/CloudControllerContext.java | 46 +++++---------------
.../cloud/controller/iaases/JcloudsIaas.java | 1 +
.../iaases/kubernetes/KubernetesIaas.java | 1 +
.../controller/util/CloudControllerUtil.java | 3 +-
5 files changed, 16 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9940dd0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
index 04aefb1..2f73f8f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
@@ -23,9 +23,9 @@ import java.util.concurrent.Callable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.context.CloudControllerContext;
-import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.domain.Cartridge;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
+import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
public class PartitionValidatorCallable implements Callable<IaasProvider> {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9940dd0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index ccbd763..52036c5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -32,6 +32,7 @@ import org.apache.stratos.cloud.controller.exception.NonExistingKubernetesHostEx
import org.apache.stratos.cloud.controller.internal.ServiceReferenceHolder;
import org.apache.stratos.cloud.controller.registry.RegistryManager;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+import org.apache.stratos.cloud.controller.domain.NetworkPartition;
import org.apache.stratos.common.services.DistributedObjectProvider;
import org.apache.stratos.common.threading.StratosThreadPool;
import org.wso2.carbon.databridge.agent.thrift.AsyncDataPublisher;
@@ -61,7 +62,6 @@ public class CloudControllerContext implements Serializable {
private static final String CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP = "CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP";
private static final String CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP = "CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP";
private static final String CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP = "CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP";
- private static final String CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYMENT_POLICY_MAP = "CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYMENT_POLICY_MAP";
private static final String CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP = "CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP";
private static final String CC_CLUSTER_CTX_WRITE_LOCK = "CC_CLUSTER_CTX_WRITE_LOCK";
@@ -145,13 +145,6 @@ public class CloudControllerContext implements Serializable {
private Map<String, ServiceGroup> serviceGroupNameToServiceGroupMap;
/**
- * Map of deploy policy
- * Key - deployment policy id
- * Value deployment policy
- */
- private Map<String, DeploymentPolicy> deploymentPolicyIDToDeployPolicyMap;
-
- /**
* Map of network partitions
* Key - network partition id
* Value network partition
@@ -199,7 +192,6 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToPartitionIdsMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP);
cartridgeTypeToCartridgeMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP);
serviceGroupNameToServiceGroupMap = distributedObjectProvider.getMap(CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP);
- deploymentPolicyIDToDeployPolicyMap=distributedObjectProvider.getMap(CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYMENT_POLICY_MAP);
networkPartitionIDToNetworkPartitionMap = distributedObjectProvider.getMap(CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP);
partitionToIaasProviderByCartridge = distributedObjectProvider.getMap(CC_PARTITION_TO_IAAS_PROVIDER_BY_CARTRIDGE_MAP);
cartridgeTypeToIaasProviders = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_IAAS_PROVIDER_MAP);
@@ -282,24 +274,6 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToCartridgeMap.put(cartridge.getType(), cartridge);
}
- public void addDeploymentPolicy(DeploymentPolicy deploymentPolicy) {
- deploymentPolicyIDToDeployPolicyMap.put(deploymentPolicy.getDeploymentPolicyID(), deploymentPolicy);
- }
-
- public DeploymentPolicy getDeploymentPolicy(String deploymentPolicyID) {
- return deploymentPolicyIDToDeployPolicyMap.get(deploymentPolicyID);
- }
-
- public Collection<DeploymentPolicy> getDeploymentPolicies() {
- return deploymentPolicyIDToDeployPolicyMap.values();
- }
-
- public void removeDeploymentPolicy(String deploymentPolicyID) {
- if (deploymentPolicyIDToDeployPolicyMap.containsKey(deploymentPolicyID)) {
- deploymentPolicyIDToDeployPolicyMap.remove(deploymentPolicyID);
- }
- }
-
public void addNetworkPartition(NetworkPartition networkPartition) {
networkPartitionIDToNetworkPartitionMap.put(networkPartition.getId(), networkPartition);
}
@@ -709,7 +683,6 @@ public class CloudControllerContext implements Serializable {
copyMap(serializedObj.cartridgeTypeToPartitionIdsMap, cartridgeTypeToPartitionIdsMap);
copyMap(serializedObj.cartridgeTypeToCartridgeMap, cartridgeTypeToCartridgeMap);
copyMap(serializedObj.serviceGroupNameToServiceGroupMap, serviceGroupNameToServiceGroupMap);
- copyMap(serializedObj.deploymentPolicyIDToDeployPolicyMap, deploymentPolicyIDToDeployPolicyMap);
copyMap(serializedObj.networkPartitionIDToNetworkPartitionMap, networkPartitionIDToNetworkPartitionMap);
if (log.isDebugEnabled()) {
@@ -756,18 +729,23 @@ public class CloudControllerContext implements Serializable {
}
public void addIaasProviders(String cartridgeType, Map<String, IaasProvider> map) {
- Map<String, IaasProvider> partitionToIaasProviders = new ConcurrentHashMap<String, IaasProvider>();
+ Map<String, IaasProvider> partitionToIaasProviders;
+ if(partitionToIaasProviderByCartridge.get(cartridgeType) != null) {
+ partitionToIaasProviders = partitionToIaasProviderByCartridge.get(cartridgeType);
+ } else {
+ partitionToIaasProviders = new ConcurrentHashMap<String, IaasProvider>();
+ }
for (Iterator<String> iterator = map.keySet().iterator(); iterator.hasNext(); ) {
String key = iterator.next();
IaasProvider value = map.get(key);
partitionToIaasProviders.put(key, value);
- if (log.isDebugEnabled()) {
- log.debug("Partition map updated for the Cartridge: " + cartridgeType + ". "
- + "Current Partition List: " + partitionToIaasProviders.keySet().toString());
- }
}
- this.partitionToIaasProviderByCartridge.put(cartridgeType, partitionToIaasProviders);
+ partitionToIaasProviderByCartridge.put(cartridgeType, partitionToIaasProviders);
+ if (log.isInfoEnabled()) {
+ log.info("Partition map updated for the Cartridge: " + cartridgeType + ". "
+ + "Current Partition List: " + partitionToIaasProviderByCartridge.get(cartridgeType).keySet().toString());
+ }
}
public IaasProvider getIaasProviderOfPartition(String cartridgeType, String partitionId) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9940dd0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
index f1c8448..7956528 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/JcloudsIaas.java
@@ -30,6 +30,7 @@ import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderExceptio
import org.apache.stratos.cloud.controller.exception.InvalidMemberException;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
+
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeMetadataBuilder;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9940dd0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
index e557692..554ea6c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
@@ -33,6 +33,7 @@ import org.apache.stratos.cloud.controller.exception.*;
import org.apache.stratos.cloud.controller.iaases.Iaas;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
+import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.common.Property;
import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.common.domain.NameValuePair;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9940dd0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 4619341..400b389 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -32,6 +32,7 @@ import org.apache.stratos.cloud.controller.exception.InvalidKubernetesHostExcept
import org.apache.stratos.cloud.controller.exception.InvalidKubernetesMasterException;
import org.apache.stratos.cloud.controller.iaases.Iaas;
import org.apache.stratos.cloud.controller.registry.RegistryManager;
+
import org.apache.stratos.common.Property;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesHost;
@@ -43,11 +44,9 @@ import org.wso2.carbon.registry.core.exceptions.RegistryException;
import com.google.common.net.InetAddresses;
import java.lang.reflect.Constructor;
-import java.util.Arrays;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;