You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/03 14:48:44 UTC
stratos git commit: storing aliasToDeploymentPolicyIdMap in
application object
Repository: stratos
Updated Branches:
refs/heads/master c799abceb -> 06676bfa4
storing aliasToDeploymentPolicyIdMap in application object
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/06676bfa
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/06676bfa
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/06676bfa
Branch: refs/heads/master
Commit: 06676bfa49b6c0301f1a6924aa8285a11a0402ff
Parents: c799abc
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Mar 3 19:18:04 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Tue Mar 3 19:18:24 2015 +0530
----------------------------------------------------------------------
.../applications/parser/DefaultApplicationParser.java | 4 ++++
.../apache/stratos/autoscaler/util/AutoscalerUtil.java | 13 ++++++-------
.../messaging/domain/application/ParentComponent.java | 10 ++++++++++
3 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/06676bfa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index e2c9f8a..80466eb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -318,6 +318,10 @@ public class DefaultApplicationParser implements ApplicationParser {
subscribableInfoCtxts));
}
}
+
+ // setting alias to deployment policy id map to the application
+ application.setAliasToDeploymentPolicyIdMap(
+ AutoscalerUtil.getAliasToDeploymentPolicyIdMapOfApplication(applicationContext));
if (log.isDebugEnabled()) {
log.debug("Application parsed successfully: [application-id] " + applicationContext.getApplicationId());
http://git-wip-us.apache.org/repos/asf/stratos/blob/06676bfa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 9e4cdec..779764a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -32,6 +32,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.autoscaler.applications.ApplicationHolder;
import org.apache.stratos.autoscaler.applications.dependency.context.ApplicationChildContext;
import org.apache.stratos.autoscaler.applications.dependency.context.ClusterChildContext;
import org.apache.stratos.autoscaler.applications.dependency.context.GroupChildContext;
@@ -416,7 +417,7 @@ public class AutoscalerUtil {
*/
private static List<String> getDeploymentPolicyIdsReferedInApplication(String applicationId) {
- Map<String, String> aliasToDeploymentPolicyIdMap = getAliasToDeploymentPolicyIdMapOfApplication(applicationId);
+ Map<String, String> aliasToDeploymentPolicyIdMap = ApplicationHolder.getApplications().getApplication(applicationId).getAliasToDeploymentPolicyIdMap();
if (aliasToDeploymentPolicyIdMap == null) {
return null;
}
@@ -424,7 +425,6 @@ public class AutoscalerUtil {
List<String> deploymentPolicyIds = new ArrayList<String>();
for (Map.Entry<String, String> entry : aliasToDeploymentPolicyIdMap.entrySet()) {
- System.out.println(entry.getKey() + "/" + entry.getValue());
if (!deploymentPolicyIds.contains(entry.getValue())) {
deploymentPolicyIds.add(entry.getValue());
}
@@ -445,7 +445,7 @@ public class AutoscalerUtil {
return null;
}
- Map<String, String> aliasToDeploymentPolicyIdMap = getAliasToDeploymentPolicyIdMapOfApplication(applicationId);
+ Map<String, String> aliasToDeploymentPolicyIdMap = ApplicationHolder.getApplications().getApplication(applicationId).getAliasToDeploymentPolicyIdMap();
if (aliasToDeploymentPolicyIdMap == null) {
return null;
@@ -459,11 +459,8 @@ public class AutoscalerUtil {
* @param applicationId the application id
* @return alias to deployment policy map
*/
- private static Map<String, String> getAliasToDeploymentPolicyIdMapOfApplication(String applicationId) {
+ public static Map<String, String> getAliasToDeploymentPolicyIdMapOfApplication(ApplicationContext applicationContext) {
- Map<String, String> aliasToDeploymentPolicyIdMap = new HashMap<String, String>();
-
- ApplicationContext applicationContext = RegistryManager.getInstance().getApplicationContext(applicationId);
if (applicationContext == null) {
return null;
}
@@ -473,6 +470,8 @@ public class AutoscalerUtil {
return null;
}
+ Map<String, String> aliasToDeploymentPolicyIdMap = new HashMap<String, String>();
+
CartridgeContext[] cartridgeContexts = componentContext.getCartridgeContexts();
if (cartridgeContexts != null && cartridgeContexts.length != 0) {
getAliasToDeployloymentPolicyIdMapFromChildCartridgeContexts(aliasToDeploymentPolicyIdMap, cartridgeContexts);
http://git-wip-us.apache.org/repos/asf/stratos/blob/06676bfa/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
index 09692db..674ab64 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/ParentComponent.java
@@ -38,6 +38,8 @@ public abstract class ParentComponent<T extends Instance> implements Serializabl
protected final Map<String, ClusterDataHolder> aliasToClusterDataMap;
// Cluster Id map, key = cartridge type
private final Map<String, ClusterDataHolder> typeToClusterDataMap;
+ // alias to deployment policy id, key = cartridge or cartridge-group alias
+ private Map<String, String> aliasToDeploymentPolicyIdMap;
// Group/Cluster Instance Context map, key = instance id
private Map<String, T> instanceIdToInstanceContextMap;
// Dependency Order
@@ -418,4 +420,12 @@ public abstract class ParentComponent<T extends Instance> implements Serializabl
this.typeToClusterDataMap.putAll(typeToClusterData);
}
+ public Map<String, String> getAliasToDeploymentPolicyIdMap() {
+ return aliasToDeploymentPolicyIdMap;
+ }
+
+ public void setAliasToDeploymentPolicyIdMap(
+ Map<String, String> aliasToDeploymentPolicyIdMap) {
+ this.aliasToDeploymentPolicyIdMap = aliasToDeploymentPolicyIdMap;
+ }
}