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/09 17:07:59 UTC
stratos git commit: prefixing application id to cluster id
Repository: stratos
Updated Branches:
refs/heads/master 96514412f -> 3b69816b0
prefixing application id to cluster id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3b69816b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3b69816b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3b69816b
Branch: refs/heads/master
Commit: 3b69816b0d686129d7fc884a03fdbf32b7e9c343
Parents: 9651441
Author: R-Rajkumar <rr...@gmail.com>
Authored: Mon Mar 9 21:19:10 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Mon Mar 9 21:19:10 2015 +0530
----------------------------------------------------------------------
.../autoscaler/applications/ClusterInformation.java | 4 ++--
.../autoscaler/applications/MTClusterInformation.java | 8 ++++----
.../autoscaler/applications/STClusterInformation.java | 8 ++++----
.../applications/parser/DefaultApplicationParser.java | 14 +++++++-------
.../stratos/autoscaler/util/AutoscalerUtil.java | 3 ++-
5 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b69816b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
index e87b13b..1ecca4d 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ClusterInformation.java
@@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.applications;
public interface ClusterInformation {
- public String getClusterId (String alias, String cartridgeType);
+ public String getClusterId (String applicationId, String alias, String cartridgeType);
- public String getHostName (String alias, String cartridgeDefinitionHostName);
+ public String getHostName (String applicationId, String alias, String cartridgeDefinitionHostName);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b69816b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
index 6d43fd0..6c8e559 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/MTClusterInformation.java
@@ -22,24 +22,24 @@ package org.apache.stratos.autoscaler.applications;
public class MTClusterInformation implements ClusterInformation {
@Override
- public String getClusterId(String alias, String cartridgeType) {
+ public String getClusterId(String applicationId, String alias, String cartridgeType) {
if (!ApplicationUtils.isValid(cartridgeType)) {
// cannot happen
throw new IllegalArgumentException("Invalid cartridge type value provided: [ " + cartridgeType + " ]");
}
- return alias + "."+cartridgeType + ".domain";
+ return applicationId + "." + alias + "."+cartridgeType + ".domain";
}
@Override
- public String getHostName(String alias, String cartridgeDefinitionHostName) {
+ public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName) {
if (!ApplicationUtils.isValid(cartridgeDefinitionHostName)) {
// cannot happen
throw new IllegalArgumentException("Invalid host name value provided: [ " + cartridgeDefinitionHostName + " ]");
}
- return cartridgeDefinitionHostName;
+ return applicationId + "." + cartridgeDefinitionHostName;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b69816b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
index b5d2a6f..1ed3e2f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/STClusterInformation.java
@@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.applications;
public class STClusterInformation implements ClusterInformation {
@Override
- public String getClusterId(String alias, String cartridgeType) {
+ public String getClusterId(String applicationId, String alias, String cartridgeType) {
if (!ApplicationUtils.isValid(alias)) {
// cannot happen
@@ -34,11 +34,11 @@ public class STClusterInformation implements ClusterInformation {
throw new IllegalArgumentException("Invalid cartridge type value provided: [ " + cartridgeType + " ]");
}
- return alias + "." + cartridgeType + ".domain";
+ return applicationId + "." + alias + "." + cartridgeType + ".domain";
}
@Override
- public String getHostName(String alias, String cartridgeDefinitionHostName) {
+ public String getHostName(String applicationId, String alias, String cartridgeDefinitionHostName) {
if (!ApplicationUtils.isValid(alias)) {
// cannot happen
@@ -50,6 +50,6 @@ public class STClusterInformation implements ClusterInformation {
throw new IllegalArgumentException("Invalid host name value provided: [ " + cartridgeDefinitionHostName + " ]");
}
- return alias + "." + cartridgeDefinitionHostName;
+ return applicationId + "." + alias + "." + cartridgeDefinitionHostName;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b69816b/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 80466eb..64c459f 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
@@ -349,7 +349,7 @@ public class DefaultApplicationParser implements ApplicationParser {
Map<String, ClusterDataHolder> clusterDataMap = new HashMap<String, ClusterDataHolder>();
Map<String, ClusterDataHolder> clusterDataMapByType = new HashMap<String, ClusterDataHolder>();
- createClusterDataMap(cartridgeContextList, clusterDataMap, clusterDataMapByType);
+ createClusterDataMap(appId, cartridgeContextList, clusterDataMap, clusterDataMapByType);
for (CartridgeContext cartridgeContext : cartridgeContextList) {
List<String> dependencyClusterIDs = new ArrayList<String>();
@@ -380,8 +380,8 @@ public class DefaultApplicationParser implements ApplicationParser {
clusterInfo = new STClusterInformation();
}
- String hostname = clusterInfo.getHostName(subscriptionAlias, cartridgeInfo.getHostName());
- String clusterId = clusterInfo.getClusterId(subscriptionAlias, cartridgeType);
+ String hostname = clusterInfo.getHostName(appId, subscriptionAlias, cartridgeInfo.getHostName());
+ String clusterId = clusterInfo.getClusterId(appId, subscriptionAlias, cartridgeType);
String repoUrl = null;
if (subscribableInfoContext.getArtifactRepositoryContext() != null) {
repoUrl = subscribableInfoContext.getArtifactRepositoryContext().getRepoUrl();
@@ -472,9 +472,9 @@ public class DefaultApplicationParser implements ApplicationParser {
return null;
}
- private void createClusterDataMap(List<CartridgeContext> cartridgeContextList,
- Map<String, ClusterDataHolder> clusterDataMap,
- Map<String, ClusterDataHolder> clusterDataMapByType)
+ private void createClusterDataMap(String applicationId,
+ List<CartridgeContext> cartridgeContextList,
+ Map<String, ClusterDataHolder> clusterDataMap, Map<String, ClusterDataHolder> clusterDataMapByType)
throws ApplicationDefinitionException {
for (CartridgeContext cartridgeContext : cartridgeContextList) {
@@ -498,7 +498,7 @@ public class DefaultApplicationParser implements ApplicationParser {
clusterInfo = new STClusterInformation();
}
- String clusterId = clusterInfo.getClusterId(subscriptionAlias, cartridgeType);
+ String clusterId = clusterInfo.getClusterId(applicationId, subscriptionAlias, cartridgeType);
// add relevant information to the map
ClusterDataHolder clusterDataHolderPerType = new ClusterDataHolder(cartridgeType, clusterId);
clusterDataHolderPerType.setMinInstances(cartridgeContext.getCartridgeMin());
http://git-wip-us.apache.org/repos/asf/stratos/blob/3b69816b/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 2009521..c9b9604 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
@@ -118,8 +118,9 @@ public class AutoscalerUtil {
RegistryManager.getInstance().removeApplication(applicationId);
}
+ //TODO we need to make sure that application id or cartridge alias should not have "."
public static String getAliasFromClusterId(String clusterId) {
- return clusterId.substring(0, clusterId.indexOf("."));
+ return StringUtils.substringBefore(StringUtils.substringAfter(clusterId, "."), ".");
}
public static boolean allClustersInitialized(Application application) {