Repository: incubator-stratos Updated Branches: refs/heads/master 917bbc6fa -> d84622f03
setting the relevant LB cluster id for each CartridgeSubscription Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5b5c3d3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5b5c3d3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5b5c3d3c Branch: refs/heads/master Commit: 5b5c3d3c1ad8fda1f57054c05686c56d2f6aec87 Parents: 38ec685 Author: Isuru <[email protected]> Authored: Wed Mar 12 23:16:50 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Mar 12 23:16:50 2014 +0530 ---------------------------------------------------------------------- .../manager/lb/category/LoadBalancerCategory.java | 8 +++----- .../manager/manager/CartridgeSubscriptionManager.java | 13 +++++++++++-- .../stratos/manager/subscription/SubscriptionData.java | 9 --------- 3 files changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b5c3d3c/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java index 3352935..573ac5b 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/lb/category/LoadBalancerCategory.java @@ -50,11 +50,9 @@ public abstract class LoadBalancerCategory extends CartridgeMgtBehaviour { this.loadBalancedServiceType = loadBalancedServiceType; } - public PayloadData create(String alias, Cluster cluster, - Subscriber subscriber, Repository repository, - CartridgeInfo cartridgeInfo, String subscriptionKey, - Map<String, String> customPayloadEntries) throws ADCException, - AlreadySubscribedException { + public PayloadData create(String alias, Cluster cluster, Subscriber subscriber, Repository repository, CartridgeInfo cartridgeInfo, + String subscriptionKey, Map<String, String> customPayloadEntries) + throws ADCException, AlreadySubscribedException { String clusterId; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b5c3d3c/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index 9688fff..13dec9a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -98,6 +98,7 @@ public class CartridgeSubscriptionManager { LBDataContext lbDataCtxt = null; CartridgeSubscription lbCartridgeSubscription = null; Properties lbCartridgeSubscriptionProperties = null; + String lbClusterId = null; // get lb config reference LoadbalancerConfig lbConfig = cartridgeInfo.getLbConfig(); @@ -117,6 +118,11 @@ public class CartridgeSubscriptionManager { // subscribe to LB lbCartridgeSubscription = subscribeToLB (subscriptionData, lbDataCtxt, cartridgeInfo); + // determine the LB cluster id, if available + if (lbCartridgeSubscription != null) { + lbClusterId = lbCartridgeSubscription.getClusterDomain(); + } + lbCartridgeSubscriptionProperties = new Properties(); if (lbDataCtxt.getLbProperperties() != null && !lbDataCtxt.getLbProperperties().isEmpty()) { lbCartridgeSubscriptionProperties.setProperties(lbDataCtxt.getLbProperperties().toArray(new Property[0])); @@ -124,7 +130,7 @@ public class CartridgeSubscriptionManager { } // subscribe to relevant service cartridge - CartridgeSubscription serviceCartridgeSubscription = subscribe (subscriptionData, cartridgeInfo); + CartridgeSubscription serviceCartridgeSubscription = subscribe (subscriptionData, cartridgeInfo, lbClusterId); serviceCartridgeSubscriptionProperties = new Properties(); // lb related properties @@ -216,7 +222,7 @@ public class CartridgeSubscriptionManager { return cartridgeSubscription; } - private CartridgeSubscription subscribe (SubscriptionData subscriptionData, CartridgeInfo cartridgeInfo) + private CartridgeSubscription subscribe (SubscriptionData subscriptionData, CartridgeInfo cartridgeInfo, String lbClusterId) throws ADCException, InvalidCartridgeAliasException, DuplicateCartridgeAliasException, PolicyException, UnregisteredCartridgeException, RepositoryRequiredException, RepositoryCredentialsRequiredException, @@ -246,6 +252,9 @@ public class CartridgeSubscriptionManager { // Create subscriber Subscriber subscriber = new Subscriber(subscriptionData.getTenantAdminUsername(), subscriptionData.getTenantId(), subscriptionData.getTenantDomain()); + // set the LB cluster id relevant to this service cluster + cartridgeSubscription.setLbClusterId(lbClusterId); + //create subscription cartridgeSubscription.createSubscription(subscriber, subscriptionData.getCartridgeAlias(), subscriptionData.getAutoscalingPolicyName(), subscriptionData.getDeploymentPolicyName(), repository); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b5c3d3c/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java index 99237fa..a90e4c5 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/SubscriptionData.java @@ -38,7 +38,6 @@ public class SubscriptionData { private boolean isPrivateRepository; private String repositoryUsername; private String repositoryPassword; - private String lbClusterId; private Property[] properties; private PersistenceContext persistanceCtxt; @@ -138,14 +137,6 @@ public class SubscriptionData { this.repositoryPassword = repositoryPassword; } - public String getLbClusterId() { - return lbClusterId; - } - - public void setLbClusterId(String lbClusterId) { - this.lbClusterId = lbClusterId; - } - public Property[] getProperties() { return properties; }
