You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/04 14:34:33 UTC
[2/2] stratos git commit: support for validate deployment policy and
fixing partition validation issue
support for validate deployment policy and fixing partition validation issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0b554d37
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0b554d37
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0b554d37
Branch: refs/heads/master
Commit: 0b554d378f2b13284000d239425b6c3f03db83ea
Parents: 17f20b3
Author: reka <rt...@gmail.com>
Authored: Thu Dec 4 19:04:20 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Dec 4 19:04:20 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java | 2 ++
.../cloud/controller/services/impl/CloudControllerServiceImpl.java | 2 +-
.../stratos/messaging/domain/applications/ParentComponent.java | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0b554d37/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
index daa439f..bd98a76 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
@@ -174,11 +174,13 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface {
Group group = application.getGroupRecursively(alias);
if(group != null) {
Set<ClusterDataHolder> clusterDataHolders = group.getClusterDataHoldersOfGroup();
+ //validating the group deployment policy against the leaf cartridges
for(ClusterDataHolder clusterDataHolder : clusterDataHolders) {
CloudControllerClient.getInstance().validateDeploymentPolicy(
clusterDataHolder.getServiceType(), partitionList.toArray(partitions));
}
} else {
+ //Validating the cartridge level deployment policy
ClusterDataHolder clusterDataHolder = application.
getClusterDataHolderRecursivelyByAlias(alias);
if(clusterDataHolder != null) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/0b554d37/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 f9c55a0..33567bd 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
@@ -1445,7 +1445,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
Map<String, Future<IaasProvider>> jobList = new HashMap<String, Future<IaasProvider>>();
for (Partition partition : partitions) {
- if (validatedPartitions.contains(partition.getId())) {
+ if (validatedPartitions != null && validatedPartitions.contains(partition.getId())) {
// partition cache hit
continue;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0b554d37/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
index af84e33..285ad2f 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
@@ -314,6 +314,7 @@ public abstract class ParentComponent<T extends Instance> implements Serializabl
if(group.getClusterData(alias) != null) {
return group.getClusterData(alias);
}
+ } else {
if (group.getGroups() != null) {
return getClusterDataByAlias(alias, group.getGroups());
}