You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/10/23 11:12:54 UTC

[1/2] git commit: Renamed RequestProcessor to RequestDelegator and added field comments

Updated Branches:
  refs/heads/master c8795ceef -> 9876baed3


Renamed RequestProcessor to RequestDelegator and added field comments


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b80079b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b80079b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b80079b3

Branch: refs/heads/master
Commit: b80079b384d302b411277412e39747599941bb3e
Parents: 260bf4f
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Oct 23 14:41:59 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Oct 23 14:41:59 2013 +0530

----------------------------------------------------------------------
 .../stratos/lb/endpoint/RequestDelegator.java   | 108 ++++++++++++++++++
 .../stratos/lb/endpoint/RequestProcessor.java   | 111 -------------------
 .../TenantAwareLoadBalanceEndpoint.java         |  21 +++-
 3 files changed, 123 insertions(+), 117 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b80079b3/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestDelegator.java b/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestDelegator.java
new file mode 100644
index 0000000..89913f6
--- /dev/null
+++ b/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestDelegator.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.lb.endpoint;
+
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.lb.endpoint.algorithm.AlgorithmContext;
+import org.apache.stratos.lb.endpoint.algorithm.LoadBalanceAlgorithm;
+import org.apache.stratos.lb.endpoint.topology.TopologyManager;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.Member;
+import org.apache.stratos.messaging.domain.topology.Service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Implements core load balancing logic for identifying the next member
+ * according to the incoming request information.
+ */
+public class RequestDelegator {
+    private static final Log log = LogFactory.getLog(RequestDelegator.class);
+
+    private LoadBalanceAlgorithm algorithm;
+
+    public RequestDelegator(LoadBalanceAlgorithm algorithm) {
+        this.algorithm = algorithm;
+    }
+
+    public Member findNextMember(String targetHost) {
+
+        try {
+            if(targetHost == null)
+                return null;
+
+            TopologyManager.acquireReadLock();
+
+            Cluster cluster = findCluster(targetHost);
+            if(cluster != null) {
+                // Find algorithm context of the cluster
+                ClusterContext clusterContext = LoadBalancerContext.getInstance().getClusterContext(cluster.getClusterId());
+                if(clusterContext == null) {
+                    clusterContext = new ClusterContext(cluster.getServiceName(), cluster.getClusterId());
+                    LoadBalancerContext.getInstance().addClusterContext(clusterContext);
+                }
+
+                AlgorithmContext algorithmContext = clusterContext.getAlgorithmContext();
+                if(algorithmContext == null) {
+                    algorithmContext = new AlgorithmContext(cluster.getServiceName(), cluster.getClusterId());
+                    clusterContext.setAlgorithmContext(algorithmContext);
+                }
+                algorithm.setMembers(new ArrayList<Member>(cluster.getMembers()));
+                Member member = algorithm.getNextMember(algorithmContext);
+                if(log.isDebugEnabled()) {
+                    log.debug(String.format("Next member found: service: %s cluster id: %s member id: %s", member.getServiceName(), member.getClusterId(), member.getMemberId()));
+                }
+                return member;
+            }
+            return null;
+        }
+        finally {
+            TopologyManager.releaseReadLock();
+        }
+    }
+
+    public Member findNextMember(String serviceName, int tenantId, String targetHost) {
+        throw new NotImplementedException();
+    }
+
+    private Service findService(String serviceName) {
+        Collection<Service> services = TopologyManager.getTopology().getServices();
+        for (Service service : services) {
+            if(service.getServiceName().equals(serviceName))
+                return service;
+        }
+        return null;
+    }
+
+    private Cluster findCluster(String targetHost) {
+        Collection<Service> services = TopologyManager.getTopology().getServices();
+        for (Service service : services) {
+            for (Cluster cluster : service.getClusters()) {
+                if (targetHost.equals(cluster.getHostName())) {
+                    return cluster;
+                }
+            }
+        }
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b80079b3/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestProcessor.java b/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestProcessor.java
deleted file mode 100644
index bb4ef32..0000000
--- a/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/RequestProcessor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.lb.endpoint;
-
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.lb.endpoint.algorithm.AlgorithmContext;
-import org.apache.stratos.lb.endpoint.algorithm.LoadBalanceAlgorithm;
-import org.apache.stratos.lb.endpoint.topology.TopologyManager;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.domain.topology.Member;
-import org.apache.stratos.messaging.domain.topology.Port;
-import org.apache.stratos.messaging.domain.topology.Service;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Implements core load balancing logic.
- */
-public class RequestProcessor {
-    private static final Log log = LogFactory.getLog(RequestProcessor.class);
-
-    private LoadBalanceAlgorithm algorithm;
-
-    public RequestProcessor(LoadBalanceAlgorithm algorithm) {
-        this.algorithm = algorithm;
-    }
-
-    public Member findNextMember(String targetHost) {
-
-        try {
-            if(targetHost == null)
-                return null;
-
-            TopologyManager.acquireReadLock();
-
-            Cluster cluster = findCluster(targetHost);
-            if(cluster != null) {
-                // Find algorithm context of the cluster
-                ClusterContext clusterContext = LoadBalancerContext.getInstance().getClusterContext(cluster.getClusterId());
-                if(clusterContext == null) {
-                    clusterContext = new ClusterContext(cluster.getServiceName(), cluster.getClusterId());
-                    LoadBalancerContext.getInstance().addClusterContext(clusterContext);
-                }
-
-                AlgorithmContext algorithmContext = clusterContext.getAlgorithmContext();
-                if(algorithmContext == null) {
-                    algorithmContext = new AlgorithmContext(cluster.getServiceName(), cluster.getClusterId());
-                    clusterContext.setAlgorithmContext(algorithmContext);
-                }
-                algorithm.setMembers(new ArrayList<Member>(cluster.getMembers()));
-                Member member = algorithm.getNextMember(algorithmContext);
-                if(log.isDebugEnabled()) {
-                    log.debug(String.format("Next member found: service: %s cluster id: %s member id: %s", member.getServiceName(), member.getClusterId(), member.getMemberId()));
-                }
-                return member;
-            }
-            return null;
-        }
-        finally {
-            TopologyManager.releaseReadLock();
-        }
-    }
-
-    public Member findNextMember(String serviceName, int tenantId, String targetHost) {
-        throw new NotImplementedException();
-    }
-
-    private Service findService(String serviceName) {
-        Collection<Service> services = TopologyManager.getTopology().getServices();
-        for (Service service : services) {
-            if(service.getServiceName().equals(serviceName))
-                return service;
-        }
-        return null;
-    }
-
-    private Cluster findCluster(String targetHost) {
-        Collection<Service> services = TopologyManager.getTopology().getServices();
-        for (Service service : services) {
-            for (Cluster cluster : service.getClusters()) {
-                if (targetHost.equals(cluster.getHostName())) {
-                    return cluster;
-                }
-            }
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b80079b3/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/endpoint/TenantAwareLoadBalanceEndpoint.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/endpoint/TenantAwareLoadBalanceEndpoint.java b/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/endpoint/TenantAwareLoadBalanceEndpoint.java
index 3032608..4a84ff8 100644
--- a/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/endpoint/TenantAwareLoadBalanceEndpoint.java
+++ b/components/org.apache.stratos.lb.endpoint/src/main/java/org/apache/stratos/lb/endpoint/endpoint/TenantAwareLoadBalanceEndpoint.java
@@ -22,7 +22,7 @@ package org.apache.stratos.lb.endpoint.endpoint;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.http.protocol.HTTP;
-import org.apache.stratos.lb.endpoint.RequestProcessor;
+import org.apache.stratos.lb.endpoint.RequestDelegator;
 import org.apache.stratos.lb.endpoint.algorithm.LoadBalanceAlgorithmFactory;
 import org.apache.stratos.lb.endpoint.stat.LoadBalancingStatsCollector;
 import org.apache.stratos.lb.endpoint.util.Constants;
@@ -50,17 +50,26 @@ import java.util.*;
 public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints.LoadbalanceEndpoint implements Serializable {
     private static final String PORT_MAPPING_PREFIX = "port.mapping.";
 
+    /* Request delegator identifies the next member */
+    private RequestDelegator requestDelegator;
+
+    /* Load balance algorithm class name */
     private String algorithmClassName;
-    private long sessionTimeout = -1;
-    private RequestProcessor requestProcessor;
-    private HttpSessionDispatcher dispatcher;
+
+    /* Flag to enable session affinity based load balancing */
     private boolean sessionAffinity;
 
+    /* Dispatcher used for session affinity */
+    private HttpSessionDispatcher dispatcher;
+
+    /* Sessions time out interval */
+    private long sessionTimeout = -1;
+
     @Override
     public void init(SynapseEnvironment synapseEnvironment) {
         super.init(synapseEnvironment);
 
-        requestProcessor = new RequestProcessor(LoadBalanceAlgorithmFactory.createAlgorithm(algorithmClassName));
+        requestDelegator = new RequestDelegator(LoadBalanceAlgorithmFactory.createAlgorithm(algorithmClassName));
         synapseEnvironment.getSynapseConfiguration().setProperty(SynapseConstants.PROP_SAL_ENDPOINT_DEFAULT_SESSION_TIMEOUT, String.valueOf(sessionTimeout));
         setDispatcher(new HttpSessionDispatcher());
     }
@@ -171,7 +180,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
 
     private org.apache.axis2.clustering.Member findNextMember(MessageContext synCtx) {
         String targetHost = extractTargetHost(synCtx);
-        Member member = requestProcessor.findNextMember(targetHost);
+        Member member = requestDelegator.findNextMember(targetHost);
         if (member == null)
             return null;
 


[2/2] git commit: Merge remote-tracking branch 'origin/master'

Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9876baed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9876baed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9876baed

Branch: refs/heads/master
Commit: 9876baed38d7db7ca2e1c34bb22c3e2b27d92725
Parents: b80079b c8795ce
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Oct 23 14:42:12 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Oct 23 14:42:12 2013 +0530

----------------------------------------------------------------------
 .../client/CloudControllerServiceClient.java    |  29 +-
 .../SingleTenantCartridgeSubscription.java      |   6 +-
 .../mgt/utils/ApplicationManagementUtil.java    |   4 +-
 .../org.apache.stratos.cloud.controller/pom.xml |  11 +-
 .../controller/axiom/AxiomXpathParser.java      |  71 +-
 .../controller/consumers/TopologyBuilder.java   | 212 ------
 .../controller/deployers/CartridgeDeployer.java |  24 +-
 .../controller/deployers/ServiceDeployer.java   |  30 +-
 .../impl/CloudControllerServiceImpl.java        | 656 +++++++++----------
 .../interfaces/CloudControllerService.java      |  91 ++-
 .../internal/CloudControllerDSComponent.java    |  23 +-
 .../jcloud/ComputeServiceBuilderUtil.java       |  30 +-
 .../CartridgeInstanceDataPublisherTask.java     |  35 +-
 .../controller/registry/RegistryManager.java    |   3 +-
 .../runtime/FasterLookUpDataHolder.java         | 102 ++-
 .../topic/TopologySynchronizerTask.java         |  35 +-
 .../controller/topology/TopologyBuilder.java    | 261 ++++++++
 .../topology/TopologyEventMessageDelegator.java |  65 ++
 .../topology/TopologyEventSender.java           | 112 ++++
 .../controller/topology/TopologyListener.java   |  43 ++
 .../controller/topology/TopologyManager.java    | 112 ++++
 .../util/CloudControllerConstants.java          |   6 +-
 .../controller/util/CloudControllerUtil.java    |  21 +-
 .../cloud/controller/util/IaasProvider.java     |  26 +-
 .../cloud/controller/util/LocationScope.java    |  70 ++
 .../cloud/controller/util/ServiceContext.java   | 119 +---
 .../controller/util/ServiceReferenceHolder.java |   1 -
 .../src/main/resources/service.xsd              |   1 -
 .../src/main/resources/services.xsd             |   1 -
 .../service/axiom/AxiomXpathParserTest.java     |   8 +-
 .../service/util/ServiceContextTest.java        |  12 +-
 .../src/test/resources/cloud-controller.xml     |   3 -
 components/pom.xml                              |   3 -
 .../main/resources/conf/cloud-controller.xml    |   2 -
 .../main/resources/CloudControllerService.wsdl  | 144 +---
 35 files changed, 1278 insertions(+), 1094 deletions(-)
----------------------------------------------------------------------