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 2014/12/09 09:54:14 UTC
[1/2] stratos git commit: update health publisher listener with the
instance_id
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 3ec2cb86d -> 106822c25
update health publisher listener with the instance_id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/106822c2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/106822c2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/106822c2
Branch: refs/heads/4.1.0-test
Commit: 106822c25ec63d09dff7ae25615b432868f7e7a6
Parents: adf60a8
Author: gayan <ga...@puppet.gayan.org>
Authored: Tue Dec 9 12:35:29 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Dec 9 14:16:36 2014 +0530
----------------------------------------------------------------------
.../agent/statistics/publisher/HealthStatisticsPublisher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/106822c2/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
index 8a26d67..0e9da7c 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
@@ -73,7 +73,7 @@ public class HealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
*/
public void publish(String clusterId, String networkPartitionId, String memberId, String partitionId, String health, double value) {
if(log.isDebugEnabled()) {
- log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [ins] %s [health] %s [value] %f",
+ log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [health] %s [value] %f",
clusterId, networkPartitionId, partitionId, memberId, health, value));
}
List<Object> payload = new ArrayList<Object>();
[2/2] stratos git commit: update health publisher listener with the
instance_id
Posted by la...@apache.org.
update health publisher listener with the instance_id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/adf60a86
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/adf60a86
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/adf60a86
Branch: refs/heads/4.1.0-test
Commit: adf60a8608d27879ce9630cc8531bfc953f21bc9
Parents: 3ec2cb8
Author: gayan <ga...@puppet.gayan.org>
Authored: Tue Dec 9 12:25:34 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Dec 9 14:16:36 2014 +0530
----------------------------------------------------------------------
.../agent/statistics/publisher/HealthStatisticsPublisher.java | 2 +-
.../load/balancer/extension/api/LoadBalancerExtension.java | 6 +++---
.../message/receiver/health/stat/HealthStatEventReceiver.java | 4 ++--
.../modules/healthstatspublisher/healthstats.py | 7 ++++---
.../cep/artifacts/streamdefinitions/stream-manager-config.xml | 2 +-
.../main/java/org/apache/stratos/haproxy/extension/Main.java | 4 ++--
6 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/adf60a86/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
index 0e9da7c..8a26d67 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsPublisher.java
@@ -73,7 +73,7 @@ public class HealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
*/
public void publish(String clusterId, String networkPartitionId, String memberId, String partitionId, String health, double value) {
if(log.isDebugEnabled()) {
- log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [health] %s [value] %f",
+ log.debug(String.format("Publishing health statistics: [cluster] %s [network-partition] %s [partition] %s [member] %s [ins] %s [health] %s [value] %f",
clusterId, networkPartitionId, partitionId, memberId, health, value));
}
List<Object> payload = new ArrayList<Object>();
http://git-wip-us.apache.org/repos/asf/stratos/blob/adf60a86/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 188b2ac..08903bc 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
@@ -34,7 +34,7 @@ import java.util.concurrent.ExecutorService;
* Load balancer extension thread for executing load balancer life-cycle according to the topology updates
* received from the message broker.
*/
-public class LoadBalancerExtension implements Runnable {
+public class LoadBalancerExtension {
private static final Log log = LogFactory.getLog(LoadBalancerExtension.class);
private LoadBalancer loadBalancer;
@@ -56,8 +56,8 @@ public class LoadBalancerExtension implements Runnable {
this.statsReader = statsReader;
}
- @Override
- public void run() {
+
+ public void execute() {
try {
if (log.isInfoEnabled()) {
log.info("Load balancer extension started");
http://git-wip-us.apache.org/repos/asf/stratos/blob/adf60a86/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
index 07e7473..c168eac 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
@@ -60,11 +60,11 @@ public class HealthStatEventReceiver {
if (log.isDebugEnabled()) {
log.debug("Health stats event message delegator thread started");
}
- // Start topology event message delegator thread
+ // Start health stat event message delegator thread
executorService.execute(messageDelegator);
} catch (Exception e) {
if (log.isErrorEnabled()) {
- log.error("Topology receiver failed", e);
+ log.error("Health stats receiver failed", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/adf60a86/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/healthstatspublisher/healthstats.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/healthstatspublisher/healthstats.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/healthstatspublisher/healthstats.py
index f06da8b..fa0f223 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/healthstatspublisher/healthstats.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/healthstatspublisher/healthstats.py
@@ -124,8 +124,8 @@ class HealthStatisticsPublisher:
stream_def.description = HealthStatisticsPublisherManager.STREAM_DESCRIPTION
- stream_def.add_payloaddata_attribute("instance_id", StreamDefinition.STRING)
stream_def.add_payloaddata_attribute("cluster_id", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("instance_id", StreamDefinition.STRING)
stream_def.add_payloaddata_attribute("network_partition_id", StreamDefinition.STRING)
stream_def.add_payloaddata_attribute("member_id", StreamDefinition.STRING)
stream_def.add_payloaddata_attribute("partition_id", StreamDefinition.STRING)
@@ -141,15 +141,15 @@ class HealthStatisticsPublisher:
"""
event = ThriftEvent()
- event.payloadData.append(self.cartridge_agent_config.instance_id)
event.payloadData.append(self.cartridge_agent_config.cluster_id)
+ event.payloadData.append(self.cartridge_agent_config.instance_id)
event.payloadData.append(self.cartridge_agent_config.network_partition_id)
event.payloadData.append(self.cartridge_agent_config.member_id)
event.payloadData.append(self.cartridge_agent_config.partition_id)
event.payloadData.append(cartridgeagentconstants.MEMORY_CONSUMPTION)
event.payloadData.append(memory_usage)
- HealthStatisticsPublisher.log.debug("Publishing cep event: [stream] %r [version] %r" % (self.stream_definition.name, self.stream_definition.version))
+ HealthStatisticsPublisher.log.debug("Publishing cep event: [stream] %r [payload_data} %r [version] %r" % (self.stream_definition.name,event.payloadData, self.stream_definition.version))
self.publisher.publish(event)
def publish_load_average(self, load_avg):
@@ -160,6 +160,7 @@ class HealthStatisticsPublisher:
event = ThriftEvent()
event.payloadData.append(self.cartridge_agent_config.cluster_id)
+ event.payloadData.append(self.cartridge_agent_config.instance_id)
event.payloadData.append(self.cartridge_agent_config.network_partition_id)
event.payloadData.append(self.cartridge_agent_config.member_id)
event.payloadData.append(self.cartridge_agent_config.partition_id)
http://git-wip-us.apache.org/repos/asf/stratos/blob/adf60a86/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 6f2f853..33d7468 100644
--- a/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
+++ b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
@@ -111,7 +111,7 @@
<correlationData>
</correlationData>
<payloadData>
- <property name="cluster_id" type="String" />
+ <property name="cluster_id" type="String" />
<property name="instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_id" type="String" />
http://git-wip-us.apache.org/repos/asf/stratos/blob/adf60a86/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
index 7996672..d7397ef 100644
--- a/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
+++ b/extensions/load-balancer/haproxy-extension/src/main/java/org/apache/stratos/haproxy/extension/Main.java
@@ -50,8 +50,8 @@ public class Main {
extension = new LoadBalancerExtension(new HAProxy(),
(HAProxyContext.getInstance().isCEPStatsPublisherEnabled() ?
new HAProxyStatisticsReader() : null));
- Thread thread = new Thread(extension);
- thread.start();
+ extension.setExecutorService(executorService);
+ extension.execute();
} catch (Exception e) {
if (log.isErrorEnabled()) {
log.error(e);