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 2015/01/10 06:36:12 UTC

[2/2] stratos git commit: Updating load balancer to receive complete application signup event

Updating load balancer to receive complete application signup event


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

Branch: refs/heads/master
Commit: d273eeb1b4d2d4597e1872390afe7bca2f2fc2e2
Parents: 0c4893c
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Jan 10 11:06:00 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Jan 10 11:06:00 2015 +0530

----------------------------------------------------------------------
 .../internal/LoadBalancerServiceComponent.java  | 40 ++++++++++--
 ...dBalancerApplicationSignUpEventReceiver.java | 69 ++++++++++++++++++++
 .../LoadBalancerDomainMappingEventReceiver.java | 17 -----
 .../LoadBalancerTenantEventReceiver.java        | 30 ++++-----
 .../LoadBalancerTopologyEventReceiver.java      |  4 --
 5 files changed, 113 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/d273eeb1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
index 20d7fe8..b1ed332 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
@@ -27,6 +27,8 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.common.clustering.DistributedObjectProvider;
 import org.apache.stratos.common.threading.StratosThreadPool;
 import org.apache.stratos.load.balancer.endpoint.EndpointDeployer;
+import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerApplicationSignUpEventReceiver;
+import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerDomainMappingEventReceiver;
 import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerTenantEventReceiver;
 import org.apache.stratos.load.balancer.messaging.receiver.LoadBalancerTopologyEventReceiver;
 import org.apache.stratos.load.balancer.exception.TenantAwareLoadBalanceEndpointException;
@@ -89,10 +91,11 @@ public class LoadBalancerServiceComponent {
     private boolean activated = false;
     private LoadBalancerTopologyEventReceiver topologyReceiver;
     private LoadBalancerTenantEventReceiver tenantReceiver;
+    private LoadBalancerApplicationSignUpEventReceiver applicationSignUpEventReceiver;
+    private LoadBalancerDomainMappingEventReceiver domainMappingEventReceiver;
     private LoadBalancerStatisticsNotifier statisticsNotifier;
 	private static final String LOAD_BALANCER_IDENTIFIER = "Load-Balancer";
 	private static final int THREAD_POOL_SIZE = 20;
-	private ExecutorService executorService;
 
     protected void activate(ComponentContext ctxt) {
         try {
@@ -120,14 +123,19 @@ public class LoadBalancerServiceComponent {
             // Configure topology filters
             TopologyFilterConfigurator.configure(configuration);
 
+            ExecutorService executorService = StratosThreadPool.getExecutorService(LOAD_BALANCER_IDENTIFIER,THREAD_POOL_SIZE);
+
+            startApplicationSignUpEventReceiver(executorService);
+            startDomainMappingEventReceiver(executorService);
+
             if (configuration.isMultiTenancyEnabled()) {
                 // Start tenant event receiver
-                startTenantEventReceiver();
+                startTenantEventReceiver(executorService);
             }
 
             if (configuration.isTopologyEventListenerEnabled()) {
                 // Start topology receiver
-                startTopologyEventReceiver();
+                startTopologyEventReceiver(executorService);
 
                 if (log.isInfoEnabled()) {
                     if (TopologyServiceFilter.getInstance().isActive()) {
@@ -180,16 +188,34 @@ public class LoadBalancerServiceComponent {
         }
     }
 
-    private void startTenantEventReceiver() {
+    private void startTenantEventReceiver(ExecutorService executorService) {
 	    tenantReceiver = new LoadBalancerTenantEventReceiver();
+        tenantReceiver.setExecutorService(executorService);
 	    tenantReceiver.execute();
         if (log.isInfoEnabled()) {
-            log.info("Tenant receiver thread started");
+            log.info("Tenant event receiver thread started");
+        }
+    }
+
+    private void startDomainMappingEventReceiver(ExecutorService executorService) {
+        domainMappingEventReceiver = new LoadBalancerDomainMappingEventReceiver();
+        domainMappingEventReceiver.setExecutorService(executorService);
+        domainMappingEventReceiver.execute();
+        if (log.isInfoEnabled()) {
+            log.info("Domain mapping event receiver thread started");
+        }
+    }
+
+    private void startApplicationSignUpEventReceiver(ExecutorService executorService) {
+        applicationSignUpEventReceiver = new LoadBalancerApplicationSignUpEventReceiver();
+        applicationSignUpEventReceiver.setExecutorService(executorService);
+        applicationSignUpEventReceiver.execute();
+        if (log.isInfoEnabled()) {
+            log.info("Application signup event receiver thread started");
         }
     }
 
-    private void startTopologyEventReceiver() {
-	    executorService= StratosThreadPool.getExecutorService(LOAD_BALANCER_IDENTIFIER,THREAD_POOL_SIZE);
+    private void startTopologyEventReceiver(ExecutorService executorService) {
 	    topologyReceiver = new LoadBalancerTopologyEventReceiver();
 	    topologyReceiver.setExecutorService(executorService);
 	    topologyReceiver.execute();

http://git-wip-us.apache.org/repos/asf/stratos/blob/d273eeb1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerApplicationSignUpEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerApplicationSignUpEventReceiver.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerApplicationSignUpEventReceiver.java
new file mode 100644
index 0000000..da7ae38
--- /dev/null
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerApplicationSignUpEventReceiver.java
@@ -0,0 +1,69 @@
+/*
+ * 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.load.balancer.messaging.receiver;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.load.balancer.context.LoadBalancerContextUtil;
+import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
+import org.apache.stratos.messaging.domain.domain.mapping.DomainMapping;
+import org.apache.stratos.messaging.event.Event;
+import org.apache.stratos.messaging.event.application.signup.CompleteApplicationSignUpsEvent;
+import org.apache.stratos.messaging.listener.application.signup.CompleteApplicationSignUpsEventListener;
+import org.apache.stratos.messaging.message.receiver.application.signup.ApplicationSignUpEventReceiver;
+
+/**
+ * Load balancer application signup event receiver.
+ */
+public class LoadBalancerApplicationSignUpEventReceiver extends ApplicationSignUpEventReceiver {
+
+    private static final Log log = LogFactory.getLog(LoadBalancerApplicationSignUpEventReceiver.class);
+
+    public LoadBalancerApplicationSignUpEventReceiver() {
+        addEventListeners();
+    }
+
+    private void addEventListeners() {
+        addEventListener(new CompleteApplicationSignUpsEventListener() {
+            @Override
+            protected void onEvent(Event event) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Complete application signup event received");
+                }
+                CompleteApplicationSignUpsEvent completeApplicationSignUpsEvent = (CompleteApplicationSignUpsEvent)event;
+                for(ApplicationSignUp applicationSignUp : completeApplicationSignUpsEvent.getApplicationSignUps()) {
+                    if(applicationSignUp.getDomainMappings() != null) {
+                        for (DomainMapping domainMapping : applicationSignUp.getDomainMappings()) {
+                            if(domainMapping != null) {
+                                LoadBalancerContextUtil.addClusterAgainstDomain(
+                                        domainMapping.getServiceName(),
+                                        domainMapping.getClusterId(),
+                                        domainMapping.getDomainName());
+
+                                LoadBalancerContextUtil.addContextPathAgainstDomain(domainMapping.getDomainName(),
+                                        domainMapping.getContextPath());
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/d273eeb1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerDomainMappingEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerDomainMappingEventReceiver.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerDomainMappingEventReceiver.java
index 78d7950..ea9238f 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerDomainMappingEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerDomainMappingEventReceiver.java
@@ -38,23 +38,6 @@ public class LoadBalancerDomainMappingEventReceiver extends DomainMappingEventRe
 
     private void addEventListeners() {
 
-//        addEventListener(new CompleteDomainMappingsEventListener() {
-//            @Override
-//            protected void onEvent(Event event) {
-//                CompleteDomainMappingsEvent completeDomainMappingsEvent = (CompleteDomainMappingsEvent)event;
-//
-//                for(DomainMapping domainMapping : completeDomainMappingsEvent.getDomainMappings()) {
-//                    LoadBalancerContextUtil.addClusterAgainstDomain(
-//                            domainMapping.getServiceName(),
-//                            domainMapping.getClusterId(),
-//                            domainMapping.getDomainName());
-//
-//                    LoadBalancerContextUtil.addContextPathAgainstDomain(domainMapping.getDomainName(),
-//                            domainMapping.getContextPath());
-//                }
-//            }
-//        });
-
         addEventListener(new DomainMappingAddedEventListener() {
             @Override
             protected void onEvent(Event event) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/d273eeb1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTenantEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTenantEventReceiver.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTenantEventReceiver.java
index b223de8..899822a 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTenantEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTenantEventReceiver.java
@@ -27,8 +27,12 @@ import org.apache.stratos.messaging.domain.tenant.Tenant;
 import org.apache.stratos.messaging.domain.topology.Service;
 import org.apache.stratos.messaging.domain.topology.ServiceType;
 import org.apache.stratos.messaging.event.Event;
-import org.apache.stratos.messaging.event.tenant.*;
-import org.apache.stratos.messaging.listener.tenant.*;
+import org.apache.stratos.messaging.event.tenant.CompleteTenantEvent;
+import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent;
+import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent;
+import org.apache.stratos.messaging.listener.tenant.CompleteTenantEventListener;
+import org.apache.stratos.messaging.listener.tenant.TenantSubscribedEventListener;
+import org.apache.stratos.messaging.listener.tenant.TenantUnSubscribedEventListener;
 import org.apache.stratos.messaging.message.receiver.tenant.TenantEventReceiver;
 import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
 
@@ -36,20 +40,16 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
  * Load balancer tenant receiver updates load balancer context according to
  * incoming tenant events.
  */
-public class LoadBalancerTenantEventReceiver{
+public class LoadBalancerTenantEventReceiver extends TenantEventReceiver {
 
     private static final Log log = LogFactory.getLog(LoadBalancerTenantEventReceiver.class);
 
-    private final TenantEventReceiver tenantEventReceiver;
-    private boolean terminated;
-
     public LoadBalancerTenantEventReceiver() {
-        tenantEventReceiver = new TenantEventReceiver();
         addEventListeners();
     }
 
     private void addEventListeners() {
-        tenantEventReceiver.addEventListener(new CompleteTenantEventListener() {
+        addEventListener(new CompleteTenantEventListener() {
             private boolean initialized;
 
             @Override
@@ -74,7 +74,7 @@ public class LoadBalancerTenantEventReceiver{
             }
         });
 
-        tenantEventReceiver.addEventListener(new TenantSubscribedEventListener() {
+        addEventListener(new TenantSubscribedEventListener() {
             @Override
             protected void onEvent(Event event) {
                 TenantSubscribedEvent tenantSubscribedEvent = (TenantSubscribedEvent) event;
@@ -94,7 +94,7 @@ public class LoadBalancerTenantEventReceiver{
             }
         });
 
-        tenantEventReceiver.addEventListener(new TenantUnSubscribedEventListener() {
+        addEventListener(new TenantUnSubscribedEventListener() {
             @Override
             protected void onEvent(Event event) {
                 TenantUnSubscribedEvent tenantUnSubscribedEvent = (TenantUnSubscribedEvent) event;
@@ -139,18 +139,10 @@ public class LoadBalancerTenantEventReceiver{
     }
 
     public void execute() {
-        tenantEventReceiver.execute();
+        super.execute();
 
         if (log.isInfoEnabled()) {
             log.info("Load balancer tenant receiver thread terminated");
         }
     }
-
-    /**
-     * Terminate load balancer tenant receiver thread.
-     */
-    public void terminate() {
-        tenantEventReceiver.terminate();
-        terminated = true;
-    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/d273eeb1/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
index 2f8b087..9640ded 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
@@ -46,7 +46,6 @@ public class LoadBalancerTopologyEventReceiver {
     private static final Log log = LogFactory.getLog(LoadBalancerTopologyEventReceiver.class);
 	private ExecutorService executorService;
     private TopologyEventReceiver topologyEventReceiver;
-    private boolean terminated;
 
     public LoadBalancerTopologyEventReceiver() {
         this.topologyEventReceiver = new TopologyEventReceiver();
@@ -59,8 +58,6 @@ public class LoadBalancerTopologyEventReceiver {
         if (log.isInfoEnabled()) {
             log.info("Load balancer topology receiver thread started");
         }
-
-
     }
 
     private void addEventListeners() {
@@ -408,7 +405,6 @@ public class LoadBalancerTopologyEventReceiver {
      */
     public void terminate() {
         topologyEventReceiver.terminate();
-        terminated = true;
     }
 
 	public ExecutorService getExecutorService() {