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/05/15 13:30:46 UTC
stratos git commit: Adding cluster instance id to in_flight_requests
CEP stream and fixing mock iaas in_flight_requests publishing
Repository: stratos
Updated Branches:
refs/heads/master a38891fcc -> 5f44b024d
Adding cluster instance id to in_flight_requests CEP stream and fixing mock iaas in_flight_requests publishing
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5f44b024
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5f44b024
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5f44b024
Branch: refs/heads/master
Commit: 5f44b024d60073d1ef42afecc865c358772929ee
Parents: a38891f
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri May 15 17:00:27 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri May 15 17:00:36 2015 +0530
----------------------------------------------------------------------
.../common/constants/StratosConstants.java | 3 +
.../common/constants/UsageConstants.java | 58 --------------------
.../publisher/InFlightRequestPublisher.java | 5 +-
.../cep/WSO2CEPInFlightRequestPublisher.java | 10 ++--
.../LoadBalancerStatisticsReader.java | 18 ++----
.../LoadBalancerStatisticsNotifier.java | 28 ++++------
.../LoadBalancerStatisticsCollector.java | 8 +++
.../publisher/MockHealthStatisticsNotifier.java | 32 +++++------
.../streamdefinitions/stream-manager-config.xml | 2 -
.../extension/HAProxyStatisticsReader.java | 18 +++---
.../nginx/extension/NginxStatisticsReader.java | 18 +++---
11 files changed, 64 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
index c05a230..942d7d1 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
@@ -205,5 +205,8 @@ public class StratosConstants {
public static final String APPLICATION_POLICY_NETWORK_PARTITION_GROUPS = "networkPartitionGroups";
public static final String APPLICATION_POLICY_NETWORK_PARTITIONS_SPLITTER = "\\|";
public static final String APPLICATION_POLICY_NETWORK_PARTITION_GROUPS_SPLITTER = ",";
+
+ public static final String NOT_DEFINED = "not-defined";
+ public static final String CLUSTER_INSTANCE_ID = "cluster.instance.id";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java
deleted file mode 100644
index a7aab86..0000000
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/UsageConstants.java
+++ /dev/null
@@ -1,58 +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.common.constants;
-
-public class UsageConstants {
- final public static String ANY_DURATION = "anyDuration";
-
- public static final String SYSTEM_METERING_PATH =
- "/repository/components/org.wso2.carbon.system-metering";
-
- public static final String CUSTOM_METERING_PATH =
- "/repository/components/org.wso2.carbon.system-metering";
-
- // the measurements
- final public static String CAPACITY_USAGE = "capacity-usage";
-
- final public static String SERVICE_REQUEST_COUNT = "serviceRequestCount";
- final public static String SERVICE_RESPONSE_COUNT = "serviceResponseCount";
- final public static String SERVICE_FAULT_COUNT = "serviceFaultCount";
-
- public static final String BANDWIDTH_KEY_PATTERN = "%Bandwidth%";
- public static final String REGISTRY_BANDWIDTH = "RegistryBandwidth";
- public static final String SERVICE_BANDWIDTH = "ServiceBandwidth";
- public static final String WEBAPP_BANDWIDTH = "WebappBandwidth";
- public static final String IN_LABLE = "-In";
- public static final String OUT_LABLE = "-Out";
- public static final String REGISTRY_CONTENT_BANDWIDTH = "ContentBandwidth";
-
- final public static String REGISTRY_INCOMING_BW = REGISTRY_BANDWIDTH + IN_LABLE;
- final public static String REGISTRY_OUTGOING_BW = REGISTRY_BANDWIDTH + OUT_LABLE;
- final public static String REGISTRY_TOTAL_BW = "registry-total-bw-usage";
- final public static String NUMBER_OF_USERS = "number-of-users";
-
- final public static String SERVICE_INCOMING_BW = SERVICE_BANDWIDTH + IN_LABLE;
- final public static String SERVICE_OUTGOING_BW = SERVICE_BANDWIDTH + OUT_LABLE;
- final public static String SERVICE_TOTAL_BW = "serviceRequestTotalBw";
-
- final public static String WEBAPP_INCOMING_BW = WEBAPP_BANDWIDTH + IN_LABLE;
- final public static String WEBAPP_OUTGOING_BW = WEBAPP_BANDWIDTH + OUT_LABLE;
-
- final public static String API_CALL_COUNT = "apiCallCount";
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
index 75cfd4d..289be8b 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/InFlightRequestPublisher.java
@@ -28,10 +28,9 @@ public interface InFlightRequestPublisher extends StatisticsPublisher {
* Publish in-flight request count.
*
* @param clusterId Cluster id
+ * @param clusterInstanceId Cluster instance id
* @param networkPartitionId Network partition id of the cluster
- * @param activeInstancesCount Active member instance count of the cluster
* @param inFlightRequestCount In-flight request count of the cluster
- * @param servedRequestCount Served request count of the cluster
*/
- void publish(String clusterId, String networkPartitionId, int activeInstancesCount, int inFlightRequestCount, int servedRequestCount);
+ void publish(String clusterId, String clusterInstanceId, String networkPartitionId, int inFlightRequestCount);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
index d618592..2ed8883 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/statistics/publisher/wso2/cep/WSO2CEPInFlightRequestPublisher.java
@@ -52,10 +52,9 @@ public class WSO2CEPInFlightRequestPublisher extends WSO2CEPStatisticsPublisher
// Set payload definition
payloadData.add(new Attribute("cluster_id", AttributeType.STRING));
+ payloadData.add(new Attribute("cluster_instance_id", AttributeType.STRING));
payloadData.add(new Attribute("network_partition_id", AttributeType.STRING));
- payloadData.add(new Attribute("active_instances_count", AttributeType.DOUBLE));
payloadData.add(new Attribute("in_flight_request_count", AttributeType.DOUBLE));
- payloadData.add(new Attribute("served_request_count", AttributeType.DOUBLE));
streamDefinition.setPayloadData(payloadData);
return streamDefinition;
} catch (Exception e) {
@@ -67,19 +66,18 @@ public class WSO2CEPInFlightRequestPublisher extends WSO2CEPStatisticsPublisher
* Publish in-flight request count of a cluster.
*
* @param clusterId
+ * @param clusterInstanceId
* @param networkPartitionId
* @param inFlightRequestCount
- * @param servedRequestCount
*/
@Override
- public void publish(String clusterId, String networkPartitionId, int activeInstancesCount, int inFlightRequestCount, int servedRequestCount) {
+ public void publish(String clusterId, String clusterInstanceId, String networkPartitionId, int inFlightRequestCount) {
// Set payload values
List<Object> payload = new ArrayList<Object>();
payload.add(clusterId);
+ payload.add(clusterInstanceId);
payload.add(networkPartitionId);
- payload.add((double) activeInstancesCount);
payload.add((double) inFlightRequestCount);
- payload.add((double) servedRequestCount);
super.publish(payload.toArray());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
index c92345b..7e75d96 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
@@ -19,28 +19,20 @@
package org.apache.stratos.load.balancer.common.statistics;
-import org.apache.stratos.load.balancer.common.domain.Cluster;
-
/**
* Load balancer statistics reader interface.
*/
public interface LoadBalancerStatisticsReader {
/**
- * Returns in-flight request count of sliding window configured.
- *
- * @param clusterId
+ * Returns the cluster instance id if the load balancer is configured to serve a specific cluster instance.
+ * @return
*/
- int getInFlightRequestCount(String clusterId);
-
- int getActiveInstancesCount(Cluster cluster);
-
+ String getClusterInstanceId();
/**
- * Returns the number of requests served since the last time this method was called.
- *
+ * Returns in-flight request count of sliding window configured.
* @param clusterId
- * @return
*/
- int getServedRequestCount(String clusterId);
+ int getInFlightRequestCount(String clusterId);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java
index 52f98be..8bfe227 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/notifier/LoadBalancerStatisticsNotifier.java
@@ -76,26 +76,20 @@ public class LoadBalancerStatisticsNotifier implements Runnable {
log.debug("Publishing load balancer statistics");
}
if (inFlightRequestPublisher.isEnabled()) {
- int requestCount;
- int servedRequestCount;
- int activeInstancesCount;
+ String clusterInstanceId = statsReader.getClusterInstanceId();
for (Service service : topologyProvider.getTopology().getServices()) {
for (Cluster cluster : service.getClusters()) {
- // Publish in-flight request count of load balancer's network partition
- requestCount = statsReader.getInFlightRequestCount(cluster.getClusterId());
- servedRequestCount = statsReader.getServedRequestCount(cluster.getClusterId());
- if (requestCount == 0) {
- servedRequestCount = 0;
- }
- activeInstancesCount = statsReader.getActiveInstancesCount(cluster);
- inFlightRequestPublisher.publish(cluster.getClusterId(), networkPartitionId, activeInstancesCount, requestCount, servedRequestCount);
- log.info(String.format("In-flight request count published to cep: [cluster-id] %s [network-partition] %s [value] %d [active instances] %d [RIF] %d ",
- cluster.getClusterId(), networkPartitionId, servedRequestCount, activeInstancesCount, requestCount));
- if (log.isDebugEnabled()) {
- log.debug(String.format("In-flight request count published to cep: [cluster-id] %s [network-partition] %s [value] %d",
- cluster.getClusterId(), networkPartitionId, requestCount));
+ // Publish in-flight request count of load balancer's network partition
+ int requestCount = statsReader.getInFlightRequestCount(cluster.getClusterId());
+ inFlightRequestPublisher.publish(cluster.getClusterId(), clusterInstanceId,
+ networkPartitionId, requestCount);
+
+ if(log.isDebugEnabled()) {
+ log.debug(String.format("In-flight request count published to cep: [cluster-id] %s " +
+ "[cluster-instance-id] %s [network-partition] %s [value] %d ",
+ cluster.getClusterId(), clusterInstanceId, networkPartitionId, requestCount));
+ }
}
- }
}
} else if (log.isWarnEnabled()) {
log.warn("In-flight request count publisher is disabled");
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
index b195407..8702ca1 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
@@ -21,6 +21,7 @@ package org.apache.stratos.load.balancer.statistics;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.load.balancer.common.domain.Cluster;
import org.apache.stratos.load.balancer.common.statistics.LoadBalancerStatisticsReader;
@@ -37,10 +38,12 @@ public class LoadBalancerStatisticsCollector implements LoadBalancerStatisticsRe
// Map<ClusterId, Integer>
private Map<String, Integer> clusterIdRequestCountMap;
private Map<String, Integer> clusterIdServedRequestCountMap;
+ private String clusterInstanceId;
private LoadBalancerStatisticsCollector() {
clusterIdRequestCountMap = new ConcurrentHashMap<String, Integer>();
clusterIdServedRequestCountMap = new ConcurrentHashMap<String, Integer>();
+ clusterInstanceId = System.getProperty(StratosConstants.CLUSTER_INSTANCE_ID, StratosConstants.NOT_DEFINED);
}
public static LoadBalancerStatisticsCollector getInstance() {
@@ -66,6 +69,11 @@ public class LoadBalancerStatisticsCollector implements LoadBalancerStatisticsRe
}
}
+ @Override
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
+ }
+
public int getInFlightRequestCount(String clusterId) {
synchronized (LoadBalancerStatisticsCollector.class) {
if (clusterIdRequestCountMap.containsKey(clusterId)) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/publisher/MockHealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/publisher/MockHealthStatisticsNotifier.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/publisher/MockHealthStatisticsNotifier.java
index 9ac5d14..c2d1c6c 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/publisher/MockHealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/publisher/MockHealthStatisticsNotifier.java
@@ -21,9 +21,7 @@ package org.apache.stratos.mock.iaas.statistics.publisher;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.statistics.publisher.HealthStatisticsPublisher;
-import org.apache.stratos.common.statistics.publisher.HealthStatisticsPublisherFactory;
-import org.apache.stratos.common.statistics.publisher.StatisticsPublisherType;
+import org.apache.stratos.common.statistics.publisher.*;
import org.apache.stratos.mock.iaas.domain.MockInstanceContext;
import org.apache.stratos.mock.iaas.exceptions.NoStatisticsFoundException;
import org.apache.stratos.mock.iaas.services.impl.MockScalingFactor;
@@ -37,21 +35,25 @@ public class MockHealthStatisticsNotifier implements Runnable {
public static final String MEMORY_CONSUMPTION = "memory_consumption";
public static final String LOAD_AVERAGE = "load_average";
- public static final String REQUESTS_IN_FLIGHT = "in_flight_requests";
private final MockInstanceContext mockMemberContext;
- private final HealthStatisticsPublisher statsPublisher;
+ private final HealthStatisticsPublisher healthStatisticsPublisher;
+ private final InFlightRequestPublisher inFlightRequestPublisher;
public MockHealthStatisticsNotifier(MockInstanceContext mockMemberContext) {
this.mockMemberContext = mockMemberContext;
- this.statsPublisher = HealthStatisticsPublisherFactory.createHealthStatisticsPublisher(
+ this.healthStatisticsPublisher = HealthStatisticsPublisherFactory.createHealthStatisticsPublisher(
StatisticsPublisherType.WSO2CEP);
- this.statsPublisher.setEnabled(true);
+ this.healthStatisticsPublisher.setEnabled(true);
+
+ this.inFlightRequestPublisher = InFlightRequestPublisherFactory.createInFlightRequestPublisher(
+ StatisticsPublisherType.WSO2CEP);
+ this.inFlightRequestPublisher.setEnabled(true);
}
@Override
public void run() {
- if (!statsPublisher.isEnabled()) {
+ if (!healthStatisticsPublisher.isEnabled()) {
if (log.isWarnEnabled()) {
log.warn("Statistics publisher is disabled");
}
@@ -66,7 +68,7 @@ public class MockHealthStatisticsNotifier implements Runnable {
log.debug(String.format("Publishing memory consumption: [member-id] %s [value] %f",
mockMemberContext.getMemberId(), memoryConsumption));
}
- statsPublisher.publish(
+ healthStatisticsPublisher.publish(
mockMemberContext.getClusterId(),
mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
@@ -90,7 +92,7 @@ public class MockHealthStatisticsNotifier implements Runnable {
log.debug(String.format("Publishing load average: [member-id] %s [value] %f",
mockMemberContext.getMemberId(), loadAvereage));
}
- statsPublisher.publish(
+ healthStatisticsPublisher.publish(
mockMemberContext.getClusterId(),
mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
@@ -107,21 +109,17 @@ public class MockHealthStatisticsNotifier implements Runnable {
}
try {
- double requestsInFlight = MockHealthStatistics.getInstance().getStatistics(
+ int requestsInFlight = MockHealthStatistics.getInstance().getStatistics(
mockMemberContext.getServiceName(), MockScalingFactor.RequestsInFlight);
if (log.isDebugEnabled()) {
log.debug(String.format("Publishing requests in flight: [member-id] %s [value] %f",
mockMemberContext.getMemberId(), requestsInFlight));
}
- statsPublisher.publish(
+ inFlightRequestPublisher.publish(
mockMemberContext.getClusterId(),
mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
- mockMemberContext.getMemberId(),
- mockMemberContext.getPartitionId(),
- REQUESTS_IN_FLIGHT,
- requestsInFlight
- );
+ requestsInFlight);
} catch (NoStatisticsFoundException ignore) {
} catch (Exception e) {
if (log.isErrorEnabled()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
index cbfadf8..26110f0 100644
--- a/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
+++ b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
@@ -33,9 +33,7 @@
<property name="cluster_id" type="String"/>
<property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
- <property name="active_instances_count" type="double"/>
<property name="in_flight_request_count" type="double"/>
- <property name="served_request_count" type="double"/>
</payloadData>
</streamDefinition>
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java
index 3c2cf36..7dec489 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java
+++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/HAProxyStatisticsReader.java
@@ -21,6 +21,7 @@ package org.apache.stratos.haproxy.extension;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.common.util.CommandUtils;
import org.apache.stratos.load.balancer.common.domain.Cluster;
import org.apache.stratos.load.balancer.common.domain.Member;
@@ -41,11 +42,18 @@ public class HAProxyStatisticsReader implements LoadBalancerStatisticsReader {
private String scriptsPath;
private String statsSocketFilePath;
private TopologyProvider topologyProvider;
+ private String clusterInstanceId;
public HAProxyStatisticsReader(TopologyProvider topologyProvider) {
this.scriptsPath = HAProxyContext.getInstance().getScriptsPath();
this.statsSocketFilePath = HAProxyContext.getInstance().getStatsSocketFilePath();
this.topologyProvider = topologyProvider;
+ this.clusterInstanceId = System.getProperty(StratosConstants.CLUSTER_INSTANCE_ID, StratosConstants.NOT_DEFINED);
+ }
+
+ @Override
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
@Override
@@ -97,14 +105,4 @@ public class HAProxyStatisticsReader implements LoadBalancerStatisticsReader {
}
return 0;
}
-
- @Override
- public int getServedRequestCount(String clusterId) {
- return 0;
- }
-
- @Override
- public int getActiveInstancesCount(Cluster cluster) {
- return 0;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f44b024/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxStatisticsReader.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxStatisticsReader.java b/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxStatisticsReader.java
index 569f67b..d45aa8f 100644
--- a/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxStatisticsReader.java
+++ b/extensions/load-balancer/nginx-extension/src/main/java/org/apache/stratos/nginx/extension/NginxStatisticsReader.java
@@ -26,6 +26,7 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.conn.HttpHostConnectException;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.load.balancer.common.domain.Cluster;
import org.apache.stratos.load.balancer.common.domain.Port;
import org.apache.stratos.load.balancer.common.domain.Service;
@@ -46,9 +47,16 @@ public class NginxStatisticsReader implements LoadBalancerStatisticsReader {
private static final Log log = LogFactory.getLog(NginxStatisticsReader.class);
private TopologyProvider topologyProvider;
+ private String clusterInstanceId;
public NginxStatisticsReader(TopologyProvider topologyProvider) {
this.topologyProvider = topologyProvider;
+ this.clusterInstanceId = System.getProperty(StratosConstants.CLUSTER_INSTANCE_ID, StratosConstants.NOT_DEFINED);
+ }
+
+ @Override
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
@Override
@@ -113,14 +121,4 @@ public class NginxStatisticsReader implements LoadBalancerStatisticsReader {
}
return 0;
}
-
- @Override
- public int getServedRequestCount(String clusterId) {
- return 0;
- }
-
- @Override
- public int getActiveInstancesCount(Cluster cluster) {
- return 0;
- }
}