You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/04/02 13:16:49 UTC
git commit: Fixing LB not spawning issue
Repository: incubator-stratos
Updated Branches:
refs/heads/master e7d590ca3 -> 7057d7c03
Fixing LB not spawning issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7057d7c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7057d7c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7057d7c0
Branch: refs/heads/master
Commit: 7057d7c03c8c899e2904e3626511c4911568b22d
Parents: e7d590c
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Wed Apr 2 16:46:29 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Wed Apr 2 16:46:29 2014 +0530
----------------------------------------------------------------------
.../manager/subscription/LBCartridgeSubscription.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7057d7c0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
index 0c2254d..3bad5fd 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/LBCartridgeSubscription.java
@@ -19,6 +19,8 @@
package org.apache.stratos.manager.subscription;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo;
import org.apache.stratos.cloud.controller.stub.pojo.Properties;
import org.apache.stratos.manager.dao.CartridgeSubscriptionInfo;
@@ -42,6 +44,7 @@ import org.apache.stratos.manager.utils.ApplicationManagementUtil;
public class LBCartridgeSubscription extends CartridgeSubscription {
private LoadBalancerCategory loadBalancerCategory;
+ private static Log log = LogFactory.getLog(LBCartridgeSubscription.class);
/**
* Constructor
@@ -77,10 +80,12 @@ public class LBCartridgeSubscription extends CartridgeSubscription {
@Override
- public CartridgeSubscriptionInfo registerSubscription(Properties properties) throws ADCException, UnregisteredCartridgeException {
- CartridgeInfo cartridgeInfo = getCartridgeInfo();
- if(!cartridgeInfo.isMultiTenantSpecified()) {
- getLoadBalancerCategory().register (cartridgeInfo, getCluster(), getPayloadData(), getAutoscalingPolicyName(),
+ public CartridgeSubscriptionInfo registerSubscription(Properties properties) throws ADCException, UnregisteredCartridgeException {
+ if(!loadBalancerCategory.isLoadBalancedServiceMultiTenant()) {
+ if(log.isDebugEnabled()) {
+ log.debug("Loadbalanced service is single tenant.");
+ }
+ getLoadBalancerCategory().register (getCartridgeInfo(), getCluster(), getPayloadData(), getAutoscalingPolicyName(),
getDeploymentPolicyName(), properties);
}