You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2013/12/11 15:36:31 UTC
[1/3] git commit: adding clusterId and partitionId to stream
definitions
Updated Branches:
refs/heads/master e7a21bb6c -> bd8328e98
adding clusterId and partitionId to stream definitions
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a23adf27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a23adf27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a23adf27
Branch: refs/heads/master
Commit: a23adf2724ff2c96070c437252874dc8874485c6
Parents: eaf1774
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Dec 11 19:52:10 2013 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Dec 11 19:52:10 2013 +0530
----------------------------------------------------------------------
.../executionplans/AverageHeathRequest.xml | 7 +++----
.../AverageRequestsInflightFinder.xml | 6 +++---
.../executionplans/GradientOfHealthRequest.xml | 17 +++++++--------
.../GradientOfRequestsInFlightFinder.xml | 8 +++----
.../SecondDerivativeOfHealthRequest.xml | 12 +++++------
...SecondDerivativeOfRequestsInFlightFinder.xml | 8 +++----
.../stream-manager-config.xml | 18 ++++++++++++++++
.../src/main/bin/health-publisher.sh | 2 +-
.../agent/health/publisher/HealthPublisher.java | 22 ++++++++------------
9 files changed, 56 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
index ccca3fd..75c599d 100644
--- a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
+++ b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
@@ -9,10 +9,9 @@
<importedStreams>
<stream as="healthStats1" name="stratos.agent.health.stats" version="1.0.0"/>
</importedStreams>
- <queryExpressions><![CDATA[define partition healthStats1Partition by member_id;
- from healthStats1 [health_description == 'port_not_open'] select member_id, cluster_id insert into fault_message partition by healthStats1Partition;
- from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, avg(value) as average_load_average insert into average_load_average_stats partition by healthStats1Partition;
- from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, avg(value) as average_memory_consumption insert into average_memory_consumption_stats partition by healthStats1Partition;]]></queryExpressions>
+ <queryExpressions><![CDATA[from healthStats1 [health_description == 'port_not_open'] select cluster_id,partition_id,member_id group by cluster_id,partition_id insert into fault_message;
+ from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select cluster_id,partition_id,member_id, avg(value) as average_load_average group by cluster_id,partition_id insert into average_load_average_stats;
+ from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select cluster_id,partition_id,member_id, avg(value) as average_memory_consumption group by cluster_id,partition_id insert into average_memory_consumption_stats;]]></queryExpressions>
<exportedStreams>
<stream name="average_load_average_stats" passthroughFlow="disable"
valueOf="average_load_average_stats" version="1.0.0"/>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml b/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml
index 6ec19fc..4f72ece 100644
--- a/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml
+++ b/extensions/cep/artifacts/executionplans/AverageRequestsInflightFinder.xml
@@ -7,11 +7,11 @@
<property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
</siddhiConfiguration>
<importedStreams>
- <stream as="lbStats1" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
+ <stream as="lbStats1" name="stratos.lb.stats" version="1.0.0"/>
</importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
+ <queryExpressions><![CDATA[
from lbStats1#window.timeBatch(1 min)
-select cluster_id, avg(in_flight_request_count) as count insert into aggregated_requests_stats partition by lbStats1Partition;]]></queryExpressions>
+select cluster_id,partition_id, avg(in_flight_requests) as count group by cluster_id,partition_id insert into aggregated_requests_stats;]]></queryExpressions>
<exportedStreams>
<stream name="aggregated_requests_stats"
valueOf="aggregated_requests_stats" version="1.0.0"/>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
index 4a5d2cb..a286c12 100644
--- a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
+++ b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<executionPlan name="GradientOfHealthRequest" statistics="disable"
- trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
<description>This will find the gradient of the heath request over a minute.</description>
<siddhiConfiguration>
<property name="siddhi.enable.distributed.processing">false</property>
@@ -9,16 +9,15 @@
<importedStreams>
<stream as="healthStats2" name="stratos.agent.health.stats" version="1.0.0"/>
</importedStreams>
- <queryExpressions><![CDATA[define partition healthStats2Partition by member_id;
- from healthStats2 #window.stratos:faultHandling(1min, member_id) select member_id, cluster_id insert into fault_message partition by healthStats2Partition;
- from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_load_average insert into gradient_load_average_stats partition by healthStats2Partition;
- from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, value as gradient_memory_consumption insert into gradient_memory_consumption_stats partition by healthStats2Partition;]]></queryExpressions>
+ <queryExpressions><![CDATA[
+ from healthStats2 #window.stratos:faultHandling(1min, member_id) select cluster_id,partition_id,member_id group by cluster_id,partition_id insert into fault_message;
+ from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id, member_id, value as gradient_load_average group by cluster_id,partition_id insert into gradient_load_average_stats;
+ from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select cluster_id,partition_id,member_id, value as gradient_memory_consumption group by cluster_id,partition_id insert into gradient_memory_consumption_stats;]]></queryExpressions>
<exportedStreams>
- <stream name="gradient_load_average_stats" passthroughFlow="disable"
+ <stream name="gradient_load_average_stats"
valueOf="gradient_load_average_stats" version="1.0.0"/>
- <stream name="gradient_memory_consumption_stats" passthroughFlow="disable"
+ <stream name="gradient_memory_consumption_stats"
valueOf="gradient_memory_consumption_stats" version="1.0.0"/>
- <stream name="fault_message" passthroughFlow="disable"
- valueOf="fault_message" version="1.0.0"/>
+ <stream name="fault_message" valueOf="fault_message" version="1.0.0"/>
</exportedStreams>
</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
index a8be5fa..27286fe 100644
--- a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
+++ b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
@@ -7,11 +7,11 @@
<property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
</siddhiConfiguration>
<importedStreams>
- <stream as="lbStats2" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
+ <stream as="lbStats2" name="stratos.lb.stats" version="1.0.0"/>
</importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
-from lbStats2#window.stratos:gradient(1 min, in_flight_request_count)
-select cluster_id, in_flight_request_count as count insert into gradient_stats partition by lbStats1Partition;]]></queryExpressions>
+ <queryExpressions><![CDATA[
+from lbStats2#window.stratos:gradient(1 min, in_flight_requests)
+select cluster_id,partition_id,in_flight_requests as count group by cluster_id,partition_id insert into gradient_stats;]]></queryExpressions>
<exportedStreams>
<stream name="gradient_stats" valueOf="gradient_stats" version="1.0.0"/>
</exportedStreams>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
index fd7c8d9..f059c8a 100644
--- a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
+++ b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<executionPlan name="SecondDerivativeOfHealthRequest"
- statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+ statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
<description>This will find the second derivative of health stats over a minute.</description>
<siddhiConfiguration>
<property name="siddhi.enable.distributed.processing">false</property>
@@ -9,13 +9,13 @@
<importedStreams>
<stream as="healthStats3" name="stratos.agent.health.stats" version="1.0.0"/>
</importedStreams>
- <queryExpressions><![CDATA[define partition healthStats3Partition by member_id;
- from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_memory_consumption insert into second_derivative_memory_consumption_stats partition by healthStats3Partition;
- from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select member_id, value as second_derivative_load_average insert into second_derivative_load_average_stats partition by healthStats3Partition;]]></queryExpressions>
+ <queryExpressions><![CDATA[
+ from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,member_id, value as second_derivative_memory_consumption group by cluster_id,partition_id insert into second_derivative_memory_consumption_stats;
+ from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id,partition_id,member_id, value as second_derivative_load_average group by cluster_id,partition_id insert into second_derivative_load_average_stats;]]></queryExpressions>
<exportedStreams>
- <stream name="second_derivative_memory_consumption_stats" passthroughFlow="disable"
+ <stream name="second_derivative_memory_consumption_stats"
valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/>
- <stream name="second_derivative_load_average_stats" passthroughFlow="disable"
+ <stream name="second_derivative_load_average_stats"
valueOf="second_derivative_load_average_stats" version="1.0.0"/>
</exportedStreams>
</executionPlan>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
index 1afde17..80863b0 100644
--- a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
+++ b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
@@ -7,11 +7,11 @@
<property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
</siddhiConfiguration>
<importedStreams>
- <stream as="lbStats3" name="stratos.lb.in.flight.req.count" version="1.0.0"/>
+ <stream as="lbStats3" name="stratos.lb.stats" version="1.0.0"/>
</importedStreams>
- <queryExpressions><![CDATA[define partition lbStats1Partition by cluster_id;
-from lbStats3#window.stratos:secondDerivative(1 min, in_flight_request_count)
-select cluster_id, in_flight_request_count as count insert into second_derivative_of_requests_stats partition by lbStats1Partition;]]></queryExpressions>
+ <queryExpressions><![CDATA[
+from lbStats3#window.stratos:secondDerivative(1 min, in_flight_requests)
+select cluster_id,partition_id,in_flight_requests as count group by cluster_id,partition_id insert into second_derivative_of_requests_stats;]]></queryExpressions>
<exportedStreams>
<stream name="second_derivative_of_requests_stats"
valueOf="second_derivative_of_requests_stats" version="1.0.0"/>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/extensions/cep/artifacts/stream_definitions/stream-manager-config.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/stream_definitions/stream-manager-config.xml b/extensions/cep/artifacts/stream_definitions/stream-manager-config.xml
index f45cdd8..d5ce719 100755
--- a/extensions/cep/artifacts/stream_definitions/stream-manager-config.xml
+++ b/extensions/cep/artifacts/stream_definitions/stream-manager-config.xml
@@ -22,6 +22,7 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="partition_id" type="String"/>
<property name="cluster_id" type="String"/>
<property name="count" type="double"/>
</payloadData>
@@ -35,6 +36,7 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="partition_id" type="String"/>
<property name="cluster_id" type="String"/>
<property name="count" type="double"/>
</payloadData>
@@ -48,6 +50,7 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="partition_id" type="String"/>
<property name="cluster_id" type="String"/>
<property name="count" type="double"/>
</payloadData>
@@ -67,6 +70,7 @@
<property name="value" type="double"/>
<property name="member_id" type="String" />
<property name="cluster_id" type="String" />
+ <property name="partition_id" type="String"/>
</payloadData>
</streamDefinition>
@@ -78,6 +82,8 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="cluster_id" type="String" />
+ <property name="partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="average_load_average" type="double"/>
</payloadData>
@@ -91,6 +97,8 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="cluster_id" type="String"/>
+ <property name="partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="average_memory_consumption" type="double"/>
</payloadData>
@@ -104,6 +112,8 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="cluster_id" type="String" />
+ <property name="partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="gradient_load_average" type="double"/>
</payloadData>
@@ -117,6 +127,8 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="cluster_id" type="String" />
+ <property name="partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="gradient_memory_consumption" type="double"/>
</payloadData>
@@ -130,6 +142,8 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="cluster_id" type="String" />
+ <property name="partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="second_derivative_memory_consumption" type="double"/>
</payloadData>
@@ -143,6 +157,8 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="cluster_id" type="String" />
+ <property name="partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="second_derivative_load_average" type="double"/>
</payloadData>
@@ -156,6 +172,8 @@
<correlationData>
</correlationData>
<payloadData>
+ <property name="cluster_id" type="String"/>
+ <property name="partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="cluster_id" type="String" />
</payloadData>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh b/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
index cd70763..9163ede 100755
--- a/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
+++ b/products/cartridge-agent/modules/health-stats/src/main/bin/health-publisher.sh
@@ -28,7 +28,7 @@ class_path=${lib_path}andes-client-0.13.wso2v8.jar:${lib_path}ant-1.7.0.jar:${li
current_path=`pwd`
-java -cp $class_path -Dmember.id=$1 -Dkey.file.path=$current_path/../security/client-truststore.jks -Dthrift.receiver.ip=$2 -Dthrift.receiver.port=$3 -Dopen.ports=$4 -Dcluster.id=$5 org.apache.stratos.cartridge.agent.health.publisher.Main $*
+java -cp $class_path -Dmember.id=$1 -Dkey.file.path=$current_path/../security/client-truststore.jks -Dthrift.receiver.ip=$2 -Dthrift.receiver.port=$3 -Dopen.ports=$4 -Dcluster.id=$5 -Dpartition.id=$6 org.apache.stratos.cartridge.agent.health.publisher.Main $*
echo "Health publisher completed"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a23adf27/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
index 38955ef..a273f57 100644
--- a/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
+++ b/products/cartridge-agent/modules/health-stats/src/main/java/org/apache/stratos/cartridge/agent/health/publisher/HealthPublisher.java
@@ -19,15 +19,6 @@
package org.apache.stratos.cartridge.agent.health.publisher;
-import java.io.File;
-import java.lang.Double;
-import java.lang.NullPointerException;
-import java.lang.String;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Observable;
-import java.util.Observer;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.databridge.agent.thrift.Agent;
@@ -35,7 +26,11 @@ import org.wso2.carbon.databridge.agent.thrift.AsyncDataPublisher;
import org.wso2.carbon.databridge.agent.thrift.conf.AgentConfiguration;
import org.wso2.carbon.databridge.agent.thrift.exception.AgentException;
import org.wso2.carbon.databridge.commons.Event;
-import org.wso2.carbon.utils.CarbonUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
public class HealthPublisher implements Observer {
@@ -71,7 +66,8 @@ public class HealthPublisher implements Observer {
" {'name':'health_description','type':'STRING'}," +
" {'name':'value','type':'DOUBLE'}," +
" {'name':'member_id','type':'STRING'}," +
- " {'name':'cluster_id','type':'STRING'}" +
+ " {'name':'cluster_id','type':'STRING'}," +
+ " {'name':'partition_id','type':'STRING'}" +
" ]" +
"}";
asyncDataPublisher.addStreamDefinition(streamDefinition, CALL_CENTER_DATA_STREAM, VERSION);
@@ -101,10 +97,11 @@ public class HealthPublisher implements Observer {
String memberID = System.getProperty("member.id");
String clusterID = System.getProperty("cluster.id");
+ String partitionId = System.getProperty("partition.id");
for (Map.Entry<String, Double> entry : stats.entrySet()) {
- Object[] payload = new Object[]{entry.getKey(), entry.getValue(), memberID, clusterID};
+ Object[] payload = new Object[]{entry.getKey(), entry.getValue(), memberID, clusterID,partitionId};
Event event = eventObject(null, null, payload, new HashMap<String, String>());
try {
asyncDataPublisher.publish(CALL_CENTER_DATA_STREAM, VERSION, event);
@@ -113,7 +110,6 @@ public class HealthPublisher implements Observer {
}
}
- stats = null;
}
private static Event eventObject(Object[] correlationData, Object[] metaData,
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/97e6ab9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/97e6ab9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/97e6ab9e
Branch: refs/heads/master
Commit: 97e6ab9ed94833ada19cbc8a540a5181abd25047
Parents: a23adf2 a39a1e1
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Dec 11 19:52:26 2013 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Dec 11 19:52:26 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 56 +-
.../client/CloudControllerServiceClient.java | 11 +-
.../internal/ADCManagementServerComponent.java | 13 +
.../mgt/listener/InstanceStatusListener.java | 6 +-
.../adc/mgt/listener/TopologyEventListner.java | 40 +
.../manager/CartridgeSubscriptionManager.java | 114 +++
.../apache/stratos/adc/mgt/payload/Payload.java | 12 +-
.../ApplicationCartridgeSubscription.java | 15 +-
.../mgt/subscription/CartridgeSubscription.java | 32 +-
.../subscription/DataCartridgeSubscription.java | 12 +-
.../FrameworkCartridgeSubscription.java | 19 +-
.../subscription/LBCartridgeSubscription.java | 8 +-
.../factory/CartridgeSubscriptionFactory.java | 6 +-
.../ServiceDeploymentMultiTenantBehaviour.java | 121 ++++
.../SubscriptionMultiTenantBehaviour.java | 29 +-
.../SubscriptionSingleTenantBehaviour.java | 2 +-
.../tenancy/SubscriptionTenancyBehaviour.java | 3 +-
.../processor/ClusterStatusEventProcessor.java | 113 +++
.../CompleteTopologyEventProcessor.java | 122 ++++
.../processor/InstanceStatusEventProcessor.java | 412 +++++++++++
.../event/processor/TopologyEventProcessor.java | 33 +
.../processor/TopologyEventProcessorChain.java | 65 ++
.../model/TopologyClusterInformationModel.java | 477 ++++++++++++
.../mgt/utils/ApplicationManagementUtil.java | 16 +-
.../stratos/autoscaler/AutoscalerContext.java | 54 +-
.../stratos/autoscaler/ClusterContext.java | 282 --------
.../stratos/autoscaler/ClusterMonitor.java | 181 +++--
.../apache/stratos/autoscaler/Constants.java | 3 +
.../stratos/autoscaler/LbClusterMonitor.java | 206 ++++++
.../stratos/autoscaler/MemberStatsContext.java | 24 +-
.../autoscaler/NetworkPartitionContext.java | 267 +++++++
.../stratos/autoscaler/PartitionContext.java | 51 +-
.../algorithm/AutoscaleAlgorithm.java | 9 +-
.../autoscaler/algorithm/OneAfterAnother.java | 60 +-
.../PartitionGroupOneAfterAnother.java | 164 -----
.../autoscaler/algorithm/RoundRobin.java | 69 +-
.../autoscaler/api/AutoScalerServiceImpl.java | 173 +++--
.../cloud/controller/CloudControllerClient.java | 13 +-
.../deployment/policy/DeploymentPolicy.java | 30 +-
.../exception/NonExistingLBException.java | 43 ++
.../interfaces/AutoScalerServiceInterface.java | 42 +-
.../internal/AutoscalerServerComponent.java | 216 ++++--
.../health/HealthEventMessageDelegator.java | 29 +-
.../receiver/health/HealthEventQueue.java | 2 +-
.../autoscaler/partition/PartitionManager.java | 112 ++-
.../partition/deployers/PartitionDeployer.java | 10 +-
.../autoscaler/policy/PolicyManager.java | 122 ++--
.../deployers/AutoscalerPolicyDeployer.java | 7 +-
.../deployers/DeploymentPolicyDeployer.java | 6 +-
.../policy/model/AutoscalePolicy.java | 9 +-
.../autoscaler/policy/model/LoadAverage.java | 7 +-
.../autoscaler/policy/model/LoadThresholds.java | 5 +-
.../policy/model/MemoryConsumption.java | 7 +-
.../policy/model/RequestsInFlight.java | 7 +-
.../autoscaler/registry/RegistryManager.java | 21 +-
.../rule/AutoscalerRuleEvaluator.java | 157 ++--
.../topology/AutoscalerTopologyReceiver.java | 169 +++--
.../autoscaler/util/AutoScalerConstants.java | 2 +
.../stratos/autoscaler/util/AutoscalerUtil.java | 152 +++-
.../stratos/autoscaler/util/Deserializer.java | 96 +++
.../cartridge/mgt/ui/CartridgeAdminClient.java | 8 +-
.../web/cartridge-mgt/available_cartridges.jsp | 4 +-
.../cartridge-mgt/map_domain_ajaxprocessor.jsp | 2 +-
.../remove_domain_ajaxprocessor.jsp | 2 +-
.../resources/web/cartridge-mgt/subscribe.jsp | 2 +-
.../cartridge-mgt/subscribe_ajaxprocessor.jsp | 4 +-
.../web/cartridge-mgt/subscribed_cartridges.jsp | 4 +-
.../subscribed_cartridges_ajaxprocessor.jsp | 4 +-
.../cartridge-mgt/sync_repo_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/test_git_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/unsubscribe_ajaxprocessor.jsp | 2 +-
components/org.apache.stratos.cli/pom.xml | 5 +
.../java/org/apache/stratos/cli/Cartridge.java | 202 ++++++
.../apache/stratos/cli/CartridgeInfoBean.java | 106 +++
.../apache/stratos/cli/CommandLineService.java | 14 +-
.../apache/stratos/cli/GenericRestClient.java | 58 ++
.../java/org/apache/stratos/cli/RestClient.java | 189 +++++
.../stratos/cli/RestCommandLineService.java | 563 ++++++++++++++
.../apache/stratos/cli/StratosApplication.java | 50 +-
.../apache/stratos/cli/SubscriptionInfo.java | 44 ++
.../org/apache/stratos/cli/TenantInfoBean.java | 85 +++
.../apache/stratos/cli/WebClientWrapper.java | 63 ++
.../stratos/cli/commands/AddTenantCommand.java | 188 +++++
.../AutoscalingPolicyDeploymentCommand.java | 138 ++++
.../commands/CartridgeDeploymentCommand.java | 140 ++++
.../stratos/cli/commands/CartridgesCommand.java | 10 +-
.../DeploymentPolicyDeploymentCommand.java | 138 ++++
.../stratos/cli/commands/ListCommand.java | 13 +-
.../commands/PartitionDeploymentCommand.java | 138 ++++
.../stratos/cli/commands/SubscribeCommand.java | 10 +-
.../cli/commands/UnsubscribeCommand.java | 5 +-
.../apache/stratos/cli/utils/CliConstants.java | 48 ++
.../cloud/controller/iaases/AWSEC2Iaas.java | 10 -
.../controller/iaases/OpenstackNovaIaas.java | 26 +-
.../impl/CloudControllerServiceImpl.java | 6 +-
.../cloud/controller/pojo/Cartridge.java | 20 +
.../cloud/controller/pojo/CartridgeConfig.java | 20 +
.../cloud/controller/pojo/CartridgeInfo.java | 20 +
.../controller/pojo/LoadbalancerConfig.java | 70 ++
.../cloud/controller/pojo/MemberContext.java | 10 +
.../controller/topology/TopologyBuilder.java | 122 +---
.../topology/TopologyEventMessageDelegator.java | 16 +-
.../topology/TopologyEventSender.java | 70 +-
.../controller/topology/TopologyManager.java | 1 -
.../util/CloudControllerConstants.java | 2 +-
.../controller/util/CloudControllerUtil.java | 9 +
.../LoadBalancerCommonServiceComponent.java | 2 +-
.../statistics/LoadBalancerStatsPublisher.java | 4 +-
.../WSO2CEPFaultyMemberPublisher.java | 6 +-
.../WSO2CEPInFlightRequestPublisher.java | 5 +-
.../statistics/WSO2CEPStatsPublisher.java | 3 -
...oadBalancerInFlightRequestCountNotifier.java | 25 +-
.../conf/LoadBalancerConfiguration.java | 2 +-
.../load/balancer/conf/util/Constants.java | 1 +
.../internal/LoadBalancerServiceComponent.java | 12 +-
.../balancer/test/RoundRobinAlgorithmTest.java | 6 +-
components/org.apache.stratos.messaging/pom.xml | 5 +
.../messaging/domain/topology/Cluster.java | 37 +-
.../messaging/domain/topology/Member.java | 30 +-
.../messaging/domain/topology/MemberStatus.java | 3 +
.../instance/status/InstanceActivatedEvent.java | 60 ++
.../instance/status/InstanceStartedEvent.java | 59 ++
.../instance/status/MemberActivatedEvent.java | 59 --
.../instance/status/MemberStartedEvent.java | 59 --
.../event/topology/ClusterCreatedEvent.java | 12 +-
.../event/topology/ClusterRemovedEvent.java | 13 +-
.../event/topology/CompleteTopologyEvent.java | 11 +-
.../event/topology/InstanceSpawnedEvent.java | 32 +-
.../event/topology/MemberActivatedEvent.java | 26 +-
.../event/topology/MemberStartedEvent.java | 16 +-
.../event/topology/MemberSuspendedEvent.java | 16 +-
.../event/topology/MemberTerminatedEvent.java | 24 +-
.../event/topology/PartitionCreatedEvent.java | 39 -
.../event/topology/PartitionRemovedEvent.java | 37 -
.../event/topology/PartitionUpdatedEvent.java | 81 ---
.../event/topology/ServiceCreatedEvent.java | 2 +-
.../event/topology/ServiceRemovedEvent.java | 11 +-
.../messaging/message/filter/MessageFilter.java | 94 +++
.../message/filter/topology/ClusterFilter.java | 83 ---
.../message/filter/topology/ServiceFilter.java | 83 ---
.../filter/topology/TopologyClusterFilter.java | 65 ++
.../filter/topology/TopologyMemberFilter.java | 46 ++
.../filter/topology/TopologyServiceFilter.java | 65 ++
.../ClusterCreatedMessageProcessor.java | 12 +-
.../ClusterRemovedMessageProcessor.java | 13 +-
.../CompleteTopologyMessageProcessor.java | 12 +-
.../InstanceSpawnedMessageProcessor.java | 27 +-
.../MemberActivatedMessageProcessor.java | 23 +-
.../topology/MemberStartedMessageProcessor.java | 23 +-
.../MemberSuspendedMessageProcessor.java | 23 +-
.../MemberTerminatedMessageProcessor.java | 23 +-
.../ServiceCreatedMessageProcessor.java | 6 +-
.../ServiceRemovedMessageProcessor.java | 6 +-
.../stratos/messaging/util/Constants.java | 14 +
.../util/bean/type/map/MapAdapter.java | 52 ++
.../util/bean/type/map/MapEntryType.java | 32 +
.../messaging/util/bean/type/map/MapType.java | 28 +
.../apache/stratos/rest/endpoint/Constants.java | 6 +-
.../definition/CartridgeDefinitionBean.java | 3 +
.../cartridge/definition/LoadBalancerBean.java | 4 +
.../definition/ServiceDefinitionBean.java | 78 ++
.../bean/util/converter/PojoConverter.java | 12 +-
.../endpoint/bean/util/type/map/MapAdapter.java | 52 ++
.../bean/util/type/map/MapEntryType.java | 32 +
.../endpoint/bean/util/type/map/MapType.java | 28 +
.../rest/endpoint/services/AbstractAdmin.java | 4 +
.../rest/endpoint/services/ServiceUtils.java | 329 ++++++++-
.../rest/endpoint/services/StratosAdmin.java | 69 +-
.../src/main/resources/addTenantRequest.txt | 2 +-
.../src/main/resources/getTenantList.txt | 2 +-
.../event/subscriber/ArtifactListener.java | 13 +-
.../subscriber/CartridgeAgentConstants.java | 7 +-
.../cartridge/agent/event/subscriber/Main.java | 11 +-
.../org.apache.stratos.adc.mgt.stub/pom.xml | 9 +-
.../pom.xml | 2 +-
.../pom.xml | 3 +-
.../src/main/resources/AutoScalerService.wsdl | 278 ++++++-
.../main/resources/CloudControllerService.wsdl | 22 +-
tools/stratos-installer/conf/setup.conf | 173 +++--
.../stratos-installer/config/sc/bin/stratos.sh | 301 --------
.../config/sc/repository/conf/axis2/axis2.xml | 724 -------------------
.../config/sc/repository/conf/carbon.xml | 586 ---------------
.../repository/conf/cartridge-config.properties | 56 --
.../conf/datasources/master-datasources.xml | 129 ----
.../conf/datasources/stratos-datasources.xml | 51 --
.../sc/repository/conf/etc/logging-config.xml | 40 -
.../config/sc/repository/conf/log4j.properties | 171 -----
.../resources/user-data/ssl-cert-snakeoil.key | 16 -
.../resources/user-data/ssl-cert-snakeoil.pem | 14 -
.../config/sm/repository/conf/carbon.xml | 586 +++++++++++++++
.../repository/conf/cartridge-config.properties | 51 ++
.../conf/datasources/master-datasources.xml | 129 ++++
.../conf/datasources/stratos-datasources.xml | 51 ++
.../config/sm/repository/conf/jndi.properties | 4 +
tools/stratos-installer/setup.sh | 633 ++++++----------
tools/stratos-installer/start-servers.sh | 2 +-
196 files changed, 8718 insertions(+), 4582 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bd8328e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bd8328e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bd8328e9
Branch: refs/heads/master
Commit: bd8328e988d71d69f40591537dc8d3d69f95c8ff
Parents: 97e6ab9 e7a21bb
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Wed Dec 11 20:06:08 2013 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Wed Dec 11 20:06:08 2013 +0530
----------------------------------------------------------------------
.../manager/CartridgeSubscriptionManager.java | 127 +++++++++++++------
.../ApplicationCartridgeSubscription.java | 2 +
.../impl/CloudControllerServiceImpl.java | 12 +-
.../controller/topology/TopologyBuilder.java | 4 +-
.../util/CloudControllerConstants.java | 1 -
.../conf/LoadBalancerConfiguration.java | 13 ++
.../TopologyFilterConfigurator.java | 6 +-
.../load/balancer/conf/util/Constants.java | 1 +
.../test/LoadBalancerConfigurationTest.java | 3 +
.../sample/configuration/loadbalancer1.conf | 10 +-
.../sample/configuration/loadbalancer2.conf | 10 +-
.../sample/configuration/loadbalancer3.conf | 10 +-
.../src/test/resources/testng.xml | 29 -----
.../messaging/message/filter/MessageFilter.java | 39 +++---
.../CompleteTopologyMessageProcessor.java | 18 +++
.../stratos/messaging/util/Constants.java | 11 +-
.../apache/stratos/rest/endpoint/Constants.java | 1 -
.../rest/endpoint/services/ServiceUtils.java | 22 ++--
.../distribution/src/main/assembly/bin.xml | 8 +-
.../distribution/src/main/conf/autoscaler.drl | 81 ------------
.../distribution/src/main/conf/mincheck.drl | 73 +++++++++++
.../distribution/src/main/conf/scaling.drl | 127 +++++++++++++++++++
.../src/main/conf/loadbalancer.conf | 10 +-
23 files changed, 423 insertions(+), 195 deletions(-)
----------------------------------------------------------------------