You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/13 05:22:21 UTC
[08/16] stratos git commit: Formatting Load balancer extension module
Formatting Load balancer extension module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e60d7515
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e60d7515
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e60d7515
Branch: refs/heads/master
Commit: e60d7515c2729aae75afc56d54abd3ff58820745
Parents: 2d54dbc
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:47:46 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:47:46 2015 +0530
----------------------------------------------------------------------
.../pom.xml | 5 +-
.../balancer/extension/api/LoadBalancer.java | 3 +-
.../extension/api/LoadBalancerExtension.java | 136 ++++++++++---------
...oadBalancerExtensionAPIServiceComponent.java | 2 +-
4 files changed, 75 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/pom.xml b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
index 34c4d5a..c54c674 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/pom.xml
+++ b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
@@ -18,9 +18,10 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
index a4911f3..68641ad 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
@@ -23,7 +23,7 @@ import org.apache.stratos.load.balancer.extension.api.exception.LoadBalancerExte
import org.apache.stratos.load.balancer.common.domain.Topology;
/**
- * A generic load balancer life-cycle definition.
+ * A generic load balancer life-cycle definition.
*/
public interface LoadBalancer {
@@ -42,6 +42,7 @@ public interface LoadBalancer {
/**
* Configure the load balancer using the given topology.
* Throw an exception is the configure operation fails.
+ *
* @param topology
* @return Returns true if configured correctly
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
index fe0c199..5d99191 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
@@ -44,13 +44,13 @@ import java.util.concurrent.ExecutorService;
* received from the message broker.
*/
public class LoadBalancerExtension {
- private static final Log log = LogFactory.getLog(LoadBalancerExtension.class);
+ private static final Log log = LogFactory.getLog(LoadBalancerExtension.class);
- private LoadBalancer loadBalancer;
- private LoadBalancerStatisticsReader statsReader;
- private boolean loadBalancerStarted;
- private LoadBalancerStatisticsNotifier statisticsNotifier;
- private ExecutorService executorService;
+ private LoadBalancer loadBalancer;
+ private LoadBalancerStatisticsReader statsReader;
+ private boolean loadBalancerStarted;
+ private LoadBalancerStatisticsNotifier statisticsNotifier;
+ private ExecutorService executorService;
private TopologyProvider topologyProvider;
private LoadBalancerCommonTopologyEventReceiver topologyEventReceiver;
@@ -58,48 +58,48 @@ public class LoadBalancerExtension {
private LoadBalancerCommonApplicationSignUpEventReceiver applicationSignUpEventReceiver;
/**
- * Load balancer extension constructor.
- *
- * @param loadBalancer Load balancer instance: Mandatory.
- * @param statsReader Statistics reader: If null statistics notifier thread will not be started.
- */
- public LoadBalancerExtension(LoadBalancer loadBalancer, LoadBalancerStatisticsReader statsReader,
+ * Load balancer extension constructor.
+ *
+ * @param loadBalancer Load balancer instance: Mandatory.
+ * @param statsReader Statistics reader: If null statistics notifier thread will not be started.
+ */
+ public LoadBalancerExtension(LoadBalancer loadBalancer, LoadBalancerStatisticsReader statsReader,
TopologyProvider topologyProvider) {
this.loadBalancer = loadBalancer;
- this.statsReader = statsReader;
+ this.statsReader = statsReader;
this.topologyProvider = topologyProvider;
- }
+ }
- public void execute() {
- try {
- if (log.isInfoEnabled()) {
- log.info("Load balancer extension started");
- }
+ public void execute() {
+ try {
+ if (log.isInfoEnabled()) {
+ log.info("Load balancer extension started");
+ }
- // Start topology receiver thread
- startTopologyEventReceiver(executorService, topologyProvider);
+ // Start topology receiver thread
+ startTopologyEventReceiver(executorService, topologyProvider);
startApplicationSignUpEventReceiver(executorService, topologyProvider);
startDomainMappingEventReceiver(executorService, topologyProvider);
- if (statsReader != null) {
- // Start stats notifier thread
- statisticsNotifier = new LoadBalancerStatisticsNotifier(statsReader, topologyProvider);
- Thread statsNotifierThread = new Thread(statisticsNotifier);
- statsNotifierThread.start();
- } else {
- if (log.isWarnEnabled()) {
- log.warn("Load balancer statistics reader not found");
- }
- }
+ if (statsReader != null) {
+ // Start stats notifier thread
+ statisticsNotifier = new LoadBalancerStatisticsNotifier(statsReader, topologyProvider);
+ Thread statsNotifierThread = new Thread(statisticsNotifier);
+ statsNotifierThread.start();
+ } else {
+ if (log.isWarnEnabled()) {
+ log.warn("Load balancer statistics reader not found");
+ }
+ }
log.info("Waiting for complete topology event...");
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Could not start load balancer extension", e);
- }
- }
- }
+ if (log.isErrorEnabled()) {
+ log.error("Could not start load balancer extension", e);
+ }
+ }
+ }
private void startTopologyEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
@@ -112,17 +112,17 @@ public class LoadBalancerExtension {
}
if (log.isInfoEnabled()) {
- if(TopologyServiceFilter.getInstance().isActive()) {
+ if (TopologyServiceFilter.getInstance().isActive()) {
log.info(String.format("Service filter activated: [filter] %s",
TopologyServiceFilter.getInstance().toString()));
}
- if(TopologyClusterFilter.getInstance().isActive()) {
+ if (TopologyClusterFilter.getInstance().isActive()) {
log.info(String.format("Cluster filter activated: [filter] %s",
TopologyClusterFilter.getInstance().toString()));
}
- if(TopologyMemberFilter.getInstance().isActive()) {
+ if (TopologyMemberFilter.getInstance().isActive()) {
log.info(String.format("Member filter activated: [filter] %s",
TopologyMemberFilter.getInstance().toString()));
}
@@ -148,7 +148,7 @@ public class LoadBalancerExtension {
}
private void addTopologyEventListeners(final LoadBalancerCommonTopologyEventReceiver topologyEventReceiver) {
- topologyEventReceiver.addEventListener(new CompleteTopologyEventListener() {
+ topologyEventReceiver.addEventListener(new CompleteTopologyEventListener() {
@Override
protected void onEvent(Event event) {
@@ -176,39 +176,40 @@ public class LoadBalancerExtension {
reloadConfiguration();
}
});
- topologyEventReceiver.addEventListener(new MemberTerminatedEventListener() {
+ topologyEventReceiver.addEventListener(new MemberTerminatedEventListener() {
@Override
protected void onEvent(Event event) {
reloadConfiguration();
}
});
- topologyEventReceiver.addEventListener(new ClusterRemovedEventListener() {
+ topologyEventReceiver.addEventListener(new ClusterRemovedEventListener() {
@Override
protected void onEvent(Event event) {
reloadConfiguration();
}
});
- topologyEventReceiver.addEventListener(new ServiceRemovedEventListener() {
+ topologyEventReceiver.addEventListener(new ServiceRemovedEventListener() {
@Override
protected void onEvent(Event event) {
reloadConfiguration();
}
});
- }
+ }
/**
* Configure and start load balancer
+ *
* @throws LoadBalancerExtensionException
*/
private void configureAndStart() throws LoadBalancerExtensionException {
// Initialize topology
- if(!topologyEventReceiver.isInitialized()) {
+ if (!topologyEventReceiver.isInitialized()) {
topologyEventReceiver.initializeTopology();
}
// Configure load balancer
Topology topology = topologyProvider.getTopology();
- if(topologyPopulated(topology) && loadBalancer.configure(topology)) {
+ if (topologyPopulated(topology) && loadBalancer.configure(topology)) {
// Start load balancer
loadBalancer.start();
loadBalancerStarted = true;
@@ -217,11 +218,12 @@ public class LoadBalancerExtension {
/**
* Configure and reload
+ *
* @throws LoadBalancerExtensionException
*/
private void configureAndReload() throws LoadBalancerExtensionException {
// Configure load balancer
- if(loadBalancer.configure(topologyProvider.getTopology())) {
+ if (loadBalancer.configure(topologyProvider.getTopology())) {
// Reload the load balancer
loadBalancer.reload();
}
@@ -229,13 +231,14 @@ public class LoadBalancerExtension {
/**
* Returns true if topology has populated
+ *
* @param topology
* @return
*/
private boolean topologyPopulated(Topology topology) {
- for(Service service : topology.getServices()) {
- for(Cluster cluster : service.getClusters()) {
- if(cluster.getMembers().size() > 0) {
+ for (Service service : topology.getServices()) {
+ for (Cluster cluster : service.getClusters()) {
+ if (cluster.getMembers().size() > 0) {
return true;
}
}
@@ -247,25 +250,24 @@ public class LoadBalancerExtension {
* Configure and reload load balancer configuration.
*/
private void reloadConfiguration() {
- try {
+ try {
if (!loadBalancerStarted) {
configureAndStart();
- }
- else {
+ } else {
configureAndReload();
}
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Could not reload load balancer configuration", e);
- }
- }
- }
+ } catch (Exception e) {
+ if (log.isErrorEnabled()) {
+ log.error("Could not reload load balancer configuration", e);
+ }
+ }
+ }
/**
* Stop load balancer instance.
*/
- public void stop() {
+ public void stop() {
try {
if (topologyEventReceiver != null) {
topologyEventReceiver.terminate();
@@ -284,13 +286,13 @@ public class LoadBalancerExtension {
loadBalancer.stop();
} catch (Exception ignore) {
}
- }
+ }
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
index c44419e..57633bc 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
@@ -36,7 +36,7 @@ public class LoadBalancerExtensionAPIServiceComponent {
protected void activate(ComponentContext context) {
try {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Load Balancer Extension API Service bundle activated");
}
} catch (Exception e) {