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 2014/12/20 23:34:40 UTC
[1/2] stratos git commit: Fixing health statistics events,
stream definitions, event publishers with cluster_instance_id attribute change
Repository: stratos
Updated Branches:
refs/heads/master b575c7d68 -> d45f4fd35
Fixing health statistics events, stream definitions, event publishers with cluster_instance_id attribute change
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/da567d07
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/da567d07
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/da567d07
Branch: refs/heads/master
Commit: da567d07f1728f8a360ca63ddf0ec9af068db35d
Parents: b575c7d
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Dec 21 03:57:29 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Dec 21 03:57:29 2014 +0530
----------------------------------------------------------------------
.../monitor/cluster/ClusterMonitor.java | 64 ++++++++++----------
.../publisher/MockHealthStatisticsNotifier.java | 4 +-
.../MockHealthStatisticsPublisher.java | 6 +-
.../health/stat/AverageLoadAverageEvent.java | 11 ++--
.../stat/AverageMemoryConsumptionEvent.java | 11 ++--
.../stat/AverageRequestsInFlightEvent.java | 10 +--
.../AverageRequestsServingCapabilityEvent.java | 12 ++--
.../health/stat/GradientOfLoadAverageEvent.java | 10 +--
.../stat/GradientOfMemoryConsumptionEvent.java | 10 +--
.../stat/GradientOfRequestsInFlightEvent.java | 10 +--
.../stat/MemberAverageLoadAverageEvent.java | 10 +--
.../MemberAverageMemoryConsumptionEvent.java | 10 +--
.../event/health/stat/MemberFaultEvent.java | 13 ++--
.../stat/MemberGradientOfLoadAverageEvent.java | 10 +--
.../MemberGradientOfMemoryConsumptionEvent.java | 10 +--
...emberSecondDerivativeOfLoadAverageEvent.java | 10 +--
...econdDerivativeOfMemoryConsumptionEvent.java | 10 +--
.../SecondDerivativeOfLoadAverageEvent.java | 10 +--
...econdDerivativeOfMemoryConsumptionEvent.java | 10 +--
...SecondDerivativeOfRequestsInFlightEvent.java | 11 ++--
.../modules/healthstatspublisher/healthstats.py | 6 +-
.../streamdefinitions/stream-manager-config.xml | 38 ++++++------
.../extension/FaultHandlingWindowProcessor.java | 4 +-
23 files changed, 150 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index d99fd55..27cad51 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -128,7 +128,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = averageLoadAverageEvent.getNetworkPartitionId();
String clusterId = averageLoadAverageEvent.getClusterId();
- String instanceId = averageLoadAverageEvent.getInstanceId();
+ String clusterInstanceId = averageLoadAverageEvent.getClusterInstanceId();
float value = averageLoadAverageEvent.getValue();
if (log.isDebugEnabled()) {
@@ -137,7 +137,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
}
ClusterInstanceContext clusterInstanceContext = getClusterInstanceContext(networkPartitionId,
- instanceId);
+ clusterInstanceId);
if (null != clusterInstanceContext) {
clusterInstanceContext.setAverageLoadAverage(value);
} else {
@@ -460,7 +460,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = gradientOfLoadAverageEvent.getNetworkPartitionId();
String clusterId = gradientOfLoadAverageEvent.getClusterId();
- String instanceId = gradientOfLoadAverageEvent.getInstanceId();
+ String instanceId = gradientOfLoadAverageEvent.getClusterInstanceId();
float value = gradientOfLoadAverageEvent.getValue();
if (log.isDebugEnabled()) {
log.debug(String.format("Grad of load avg event: [cluster] %s [network-partition] %s [value] %s",
@@ -484,14 +484,14 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = secondDerivativeOfLoadAverageEvent.getNetworkPartitionId();
String clusterId = secondDerivativeOfLoadAverageEvent.getClusterId();
- String instanceId = secondDerivativeOfLoadAverageEvent.getInstanceId();
+ String clusterInstanceId = secondDerivativeOfLoadAverageEvent.getClusterInstanceId();
float value = secondDerivativeOfLoadAverageEvent.getValue();
if (log.isDebugEnabled()) {
log.debug(String.format("Second Derivation of load avg event: [cluster] %s "
+ "[network-partition] %s [value] %s", clusterId, networkPartitionId, value));
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setLoadAverageSecondDerivative(value);
} else {
@@ -508,14 +508,14 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = averageMemoryConsumptionEvent.getNetworkPartitionId();
String clusterId = averageMemoryConsumptionEvent.getClusterId();
- String instanceId = averageMemoryConsumptionEvent.getInstanceId();
+ String clusterInstanceId = averageMemoryConsumptionEvent.getClusterInstanceId();
float value = averageMemoryConsumptionEvent.getValue();
if (log.isDebugEnabled()) {
log.debug(String.format("Avg Memory Consumption event: [cluster] %s [network-partition] %s "
+ "[value] %s", clusterId, networkPartitionId, value));
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setAverageMemoryConsumption(value);
} else {
@@ -533,14 +533,14 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = gradientOfMemoryConsumptionEvent.getNetworkPartitionId();
String clusterId = gradientOfMemoryConsumptionEvent.getClusterId();
- String instanceId = gradientOfMemoryConsumptionEvent.getInstanceId();
+ String clusterInstanceId = gradientOfMemoryConsumptionEvent.getClusterInstanceId();
float value = gradientOfMemoryConsumptionEvent.getValue();
if (log.isDebugEnabled()) {
log.debug(String.format("Grad of Memory Consumption event: [cluster] %s "
+ "[network-partition] %s [value] %s", clusterId, networkPartitionId, value));
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setMemoryConsumptionGradient(value);
} else {
@@ -557,14 +557,14 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = secondDerivativeOfMemoryConsumptionEvent.getNetworkPartitionId();
String clusterId = secondDerivativeOfMemoryConsumptionEvent.getClusterId();
- String instanceId = secondDerivativeOfMemoryConsumptionEvent.getInstanceId();
+ String clusterInstanceId = secondDerivativeOfMemoryConsumptionEvent.getClusterInstanceId();
float value = secondDerivativeOfMemoryConsumptionEvent.getValue();
if (log.isDebugEnabled()) {
log.debug(String.format("Second Derivation of Memory Consumption event: [cluster] %s "
+ "[network-partition] %s [value] %s", clusterId, networkPartitionId, value));
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setMemoryConsumptionSecondDerivative(value);
} else {
@@ -579,7 +579,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
AverageRequestsServingCapabilityEvent averageRequestsServingCapabilityEvent) {
String clusterId = averageRequestsServingCapabilityEvent.getClusterId();
- String instanceId = averageRequestsServingCapabilityEvent.getInstanceId();
+ String clusterInstanceId = averageRequestsServingCapabilityEvent.getClusterInstanceId();
String networkPartitionId = averageRequestsServingCapabilityEvent.getNetworkPartitionId();
Float floatValue = averageRequestsServingCapabilityEvent.getValue();
@@ -589,7 +589,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setAverageRequestsServedPerInstance(floatValue);
@@ -608,7 +608,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = averageRequestsInFlightEvent.getNetworkPartitionId();
String clusterId = averageRequestsInFlightEvent.getClusterId();
- String instanceId = averageRequestsInFlightEvent.getInstanceId();
+ String clusterInstanceId = averageRequestsInFlightEvent.getClusterInstanceId();
Float servedCount = averageRequestsInFlightEvent.getServedCount();
Float activeInstances = averageRequestsInFlightEvent.getActiveInstances();
Float requestsServedPerInstance = servedCount / activeInstances;
@@ -621,7 +621,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
clusterId, networkPartitionId, value));
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setAverageRequestsInFlight(value);
} else {
@@ -638,14 +638,14 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = gradientOfRequestsInFlightEvent.getNetworkPartitionId();
String clusterId = gradientOfRequestsInFlightEvent.getClusterId();
- String instanceId = gradientOfRequestsInFlightEvent.getInstanceId();
+ String clusterInstanceId = gradientOfRequestsInFlightEvent.getClusterInstanceId();
float value = gradientOfRequestsInFlightEvent.getValue();
if (log.isDebugEnabled()) {
log.debug(String.format("Gradient of Rif event: [cluster] %s [network-partition] %s [value] %s",
clusterId, networkPartitionId, value));
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setRequestsInFlightGradient(value);
} else {
@@ -662,14 +662,14 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String networkPartitionId = secondDerivativeOfRequestsInFlightEvent.getNetworkPartitionId();
String clusterId = secondDerivativeOfRequestsInFlightEvent.getClusterId();
- String instanceId = secondDerivativeOfRequestsInFlightEvent.getInstanceId();
+ String clusterInstanceId = secondDerivativeOfRequestsInFlightEvent.getClusterInstanceId();
float value = secondDerivativeOfRequestsInFlightEvent.getValue();
if (log.isDebugEnabled()) {
log.debug(String.format("Second derivative of Rif event: [cluster] %s "
+ "[network-partition] %s [value] %s", clusterId, networkPartitionId, value));
}
ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(
- networkPartitionId, instanceId);
+ networkPartitionId, clusterInstanceId);
if (null != clusterLevelNetworkPartitionContext) {
clusterLevelNetworkPartitionContext.setRequestsInFlightSecondDerivative(value);
} else {
@@ -684,12 +684,12 @@ public class ClusterMonitor extends AbstractClusterMonitor {
public void handleMemberAverageMemoryConsumptionEvent(
MemberAverageMemoryConsumptionEvent memberAverageMemoryConsumptionEvent) {
- String instanceId = memberAverageMemoryConsumptionEvent.getInstanceId();
+ String clusterInstanceId = memberAverageMemoryConsumptionEvent.getClusterInstanceId();
String memberId = memberAverageMemoryConsumptionEvent.getMemberId();
Member member = getMemberByMemberId(memberId);
String networkPartitionId = getNetworkPartitionIdByMemberId(memberId);
ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId,
- instanceId);
+ clusterInstanceId);
ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt(
member.getPartitionId());
MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId);
@@ -707,12 +707,12 @@ public class ClusterMonitor extends AbstractClusterMonitor {
public void handleMemberGradientOfMemoryConsumptionEvent(
MemberGradientOfMemoryConsumptionEvent memberGradientOfMemoryConsumptionEvent) {
- String instanceId = memberGradientOfMemoryConsumptionEvent.getInstanceId();
+ String clusterInstanceId = memberGradientOfMemoryConsumptionEvent.getClusterInstanceId();
String memberId = memberGradientOfMemoryConsumptionEvent.getMemberId();
Member member = getMemberByMemberId(memberId);
String networkPartitionId = getNetworkPartitionIdByMemberId(memberId);
ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId,
- instanceId);
+ clusterInstanceId);
ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt(
member.getPartitionId());
MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId);
@@ -736,12 +736,12 @@ public class ClusterMonitor extends AbstractClusterMonitor {
public void handleMemberAverageLoadAverageEvent(
MemberAverageLoadAverageEvent memberAverageLoadAverageEvent) {
- String instanceId = memberAverageLoadAverageEvent.getInstanceId();
+ String clusterInstanceId = memberAverageLoadAverageEvent.getClusterInstanceId();
String memberId = memberAverageLoadAverageEvent.getMemberId();
Member member = getMemberByMemberId(memberId);
String networkPartitionId = getNetworkPartitionIdByMemberId(memberId);
ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId,
- instanceId);
+ clusterInstanceId);
ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt(
member.getPartitionId());
MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId);
@@ -759,12 +759,12 @@ public class ClusterMonitor extends AbstractClusterMonitor {
public void handleMemberGradientOfLoadAverageEvent(
MemberGradientOfLoadAverageEvent memberGradientOfLoadAverageEvent) {
- String instanceId = memberGradientOfLoadAverageEvent.getInstanceId();
+ String clusterInstanceId = memberGradientOfLoadAverageEvent.getClusterInstanceId();
String memberId = memberGradientOfLoadAverageEvent.getMemberId();
Member member = getMemberByMemberId(memberId);
String networkPartitionId = getNetworkPartitionIdByMemberId(memberId);
ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId,
- instanceId);
+ clusterInstanceId);
ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt(
member.getPartitionId());
MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId);
@@ -782,13 +782,13 @@ public class ClusterMonitor extends AbstractClusterMonitor {
public void handleMemberSecondDerivativeOfLoadAverageEvent(
MemberSecondDerivativeOfLoadAverageEvent memberSecondDerivativeOfLoadAverageEvent) {
- String instanceId = memberSecondDerivativeOfLoadAverageEvent.getInstanceId();
+ String clusterInstanceId = memberSecondDerivativeOfLoadAverageEvent.getClusterInstanceId();
String memberId = memberSecondDerivativeOfLoadAverageEvent.getMemberId();
Member member = getMemberByMemberId(memberId);
String networkPartitionId = getNetworkPartitionIdByMemberId(memberId);
ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId,
- instanceId);
+ clusterInstanceId);
ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt(
member.getPartitionId());
MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId);
@@ -807,8 +807,8 @@ public class ClusterMonitor extends AbstractClusterMonitor {
String memberId = memberFaultEvent.getMemberId();
String clusterId = memberFaultEvent.getClusterId();
+ String clusterInstanceId = memberFaultEvent.getClusterInstanceId();
Member member = getMemberByMemberId(memberId);
- String instanceId = memberFaultEvent.getInstanceId();
String networkPartitionId = memberFaultEvent.getNetworkPartitionId();
if (null == member) {
if (log.isDebugEnabled()) {
@@ -825,7 +825,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
}
ClusterInstanceContext nwPartitionCtxt;
- nwPartitionCtxt = getClusterInstanceContext(networkPartitionId, instanceId);
+ nwPartitionCtxt = getClusterInstanceContext(networkPartitionId, clusterInstanceId);
String partitionId = getPartitionOfMember(memberId);
ClusterLevelPartitionContext partitionCtxt = nwPartitionCtxt.getPartitionCtxt(partitionId);
if (!partitionCtxt.activeMemberExist(memberId)) {
@@ -846,7 +846,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
}
ServiceReferenceHolder.getInstance().getClusterStatusProcessorChain().process(
- ClusterStatusInactiveProcessor.class.getName(), clusterId, instanceId);
+ ClusterStatusInactiveProcessor.class.getName(), clusterId, clusterInstanceId);
}
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsNotifier.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsNotifier.java
index 4962e2c..ca345b4 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsNotifier.java
@@ -63,7 +63,7 @@ public class MockHealthStatisticsNotifier implements Runnable {
}
statsPublisher.publish(
mockMemberContext.getClusterId(),
- mockMemberContext.getInstanceId(),
+ mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
mockMemberContext.getMemberId(),
mockMemberContext.getPartitionId(),
@@ -87,7 +87,7 @@ public class MockHealthStatisticsNotifier implements Runnable {
}
statsPublisher.publish(
mockMemberContext.getClusterId(),
- mockMemberContext.getInstanceId(),
+ mockMemberContext.getClusterInstanceId(),
mockMemberContext.getNetworkPartitionId(),
mockMemberContext.getMemberId(),
mockMemberContext.getPartitionId(),
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsPublisher.java
index a4b968c..90c641d 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/mock/statistics/publisher/MockHealthStatisticsPublisher.java
@@ -46,7 +46,7 @@ public class MockHealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
// Payload definition
List<Attribute> payloadData = new ArrayList<Attribute>();
payloadData.add(new Attribute("cluster_id", AttributeType.STRING));
- payloadData.add(new Attribute("instance_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("member_id", AttributeType.STRING));
payloadData.add(new Attribute("partition_id", AttributeType.STRING));
@@ -72,7 +72,7 @@ public class MockHealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
* @param health
* @param value
*/
- public void publish(String clusterId, String instanceId, String networkPartitionId, String memberId, String partitionId, String health, double value) {
+ public void publish(String clusterId, String clusterInstanceId, 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",
clusterId, networkPartitionId, partitionId, memberId, health, value));
@@ -80,7 +80,7 @@ public class MockHealthStatisticsPublisher extends WSO2CEPStatisticsPublisher {
List<Object> payload = new ArrayList<Object>();
// Payload values
payload.add(clusterId);
- payload.add(instanceId);
+ payload.add(clusterInstanceId);
payload.add(networkPartitionId);
payload.add(memberId);
payload.add(partitionId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java
index c968151..a5c3c45 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageLoadAverageEvent.java
@@ -27,18 +27,17 @@ import org.apache.stratos.messaging.event.Event;
public class AverageLoadAverageEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
+ private String clusterInstanceId;
private final float value;
- private final String instanceId;
- public AverageLoadAverageEvent(String networkPartitionId, String clusterId, String instanceId, float value){
+ public AverageLoadAverageEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value){
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
- this.instanceId = instanceId;
}
-
public String getClusterId() {
return clusterId;
}
@@ -51,7 +50,7 @@ public class AverageLoadAverageEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java
index d585545..c04d544 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageMemoryConsumptionEvent.java
@@ -27,14 +27,13 @@ import org.apache.stratos.messaging.event.Event;
public class AverageMemoryConsumptionEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
- public AverageMemoryConsumptionEvent(String networkPartitionId, String clusterId, String instanceId, float value){
-
+ public AverageMemoryConsumptionEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value){
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
}
@@ -51,7 +50,7 @@ public class AverageMemoryConsumptionEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java
index 3f58ebc..a6af406 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsInFlightEvent.java
@@ -27,15 +27,15 @@ import org.apache.stratos.messaging.event.Event;
public class AverageRequestsInFlightEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
private final float servedCount;
private final float activeInstances;
- public AverageRequestsInFlightEvent(String networkPartitionId, String clusterId, String instanceId, float activeInstances, float value, float servedCount ) {
+ public AverageRequestsInFlightEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float activeInstances, float value, float servedCount ) {
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
this.servedCount = servedCount;
this.activeInstances = activeInstances;
@@ -58,7 +58,7 @@ public class AverageRequestsInFlightEvent extends Event {
public float getActiveInstances() { return activeInstances;}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsServingCapabilityEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsServingCapabilityEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsServingCapabilityEvent.java
index 47fbf7e..c03dc81 100755
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsServingCapabilityEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/AverageRequestsServingCapabilityEvent.java
@@ -7,15 +7,14 @@ import org.apache.stratos.messaging.event.Event;
public class AverageRequestsServingCapabilityEvent extends Event{
private final String networkPartitionId;
private final String clusterId;
+ private final String clusterInstanceId;
private final float value;
- private final String instanceId;
- public AverageRequestsServingCapabilityEvent(String networkPartitionId, String clusterId, float value, String instanceId) {
+ public AverageRequestsServingCapabilityEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value) {
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
-
- this.instanceId = instanceId;
}
public String getClusterId() {
return clusterId;
@@ -29,8 +28,7 @@ public class AverageRequestsServingCapabilityEvent extends Event{
return networkPartitionId;
}
-
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java
index 815c0f7..1bcf5b1 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfLoadAverageEvent.java
@@ -27,13 +27,13 @@ import org.apache.stratos.messaging.event.Event;
public class GradientOfLoadAverageEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
- public GradientOfLoadAverageEvent(String networkPartitionId, String clusterId, String instanceId, float value) {
+ public GradientOfLoadAverageEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value) {
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
}
@@ -50,7 +50,7 @@ public class GradientOfLoadAverageEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java
index 1779652..fd3f43e 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfMemoryConsumptionEvent.java
@@ -27,13 +27,13 @@ import org.apache.stratos.messaging.event.Event;
public class GradientOfMemoryConsumptionEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
- public GradientOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, String instanceId, float value) {
+ public GradientOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value) {
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
}
@@ -50,7 +50,7 @@ public class GradientOfMemoryConsumptionEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java
index cd4fe5b..49b2622 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/GradientOfRequestsInFlightEvent.java
@@ -27,13 +27,13 @@ import org.apache.stratos.messaging.event.Event;
public class GradientOfRequestsInFlightEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
- public GradientOfRequestsInFlightEvent(String networkPartitionId, String clusterId, String instanceId, float value) {
+ public GradientOfRequestsInFlightEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value) {
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
}
@@ -50,7 +50,7 @@ public class GradientOfRequestsInFlightEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java
index 33f455e..86ae9fa 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageLoadAverageEvent.java
@@ -26,11 +26,11 @@ import org.apache.stratos.messaging.event.Event;
*/
public class MemberAverageLoadAverageEvent extends Event {
private final String memberId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
- public MemberAverageLoadAverageEvent(String instanceId, String memberId, float value) {
- this.instanceId = instanceId;
+ public MemberAverageLoadAverageEvent(String clusterInstanceId, String memberId, float value) {
+ this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
this.value = value;
}
@@ -44,7 +44,7 @@ public class MemberAverageLoadAverageEvent extends Event {
return value;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java
index 87fc446..5287f54 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberAverageMemoryConsumptionEvent.java
@@ -25,12 +25,12 @@ import org.apache.stratos.messaging.event.Event;
* This event is fired by Event processing engine to send average of memory consumption
*/
public class MemberAverageMemoryConsumptionEvent extends Event {
- private final String instanceId;
+ private final String clusterInstanceId;
private final String memberId;
private final float value;
- public MemberAverageMemoryConsumptionEvent(String instanceId, String memberId, float value) {
- this.instanceId = instanceId;
+ public MemberAverageMemoryConsumptionEvent(String clusterInstanceId, String memberId, float value) {
+ this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
this.value = value;
}
@@ -44,7 +44,7 @@ public class MemberAverageMemoryConsumptionEvent extends Event {
return value;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
index e576ba8..87eaa0c 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberFaultEvent.java
@@ -26,16 +26,17 @@ import org.apache.stratos.messaging.event.Event;
*/
public class MemberFaultEvent extends Event {
private final String clusterId;
+ private final String clusterInstanceId;
private final String memberId;
- private final String partitionId;
private final String instanceId;
+ private final String partitionId;
private final String networkPartitionId;
-
private final float value;
- public MemberFaultEvent(String clusterId, String memberId, String partitionId,
- String instanceId, String networkPartitionId, float value) {
+ public MemberFaultEvent(String clusterId, String clusterInstanceId, String memberId, String instanceId,
+ String partitionId, String networkPartitionId, float value) {
this.clusterId = clusterId;
+ this.clusterInstanceId = clusterInstanceId;
this.instanceId = instanceId;
this.memberId = memberId;
this.partitionId = partitionId;
@@ -67,4 +68,8 @@ public class MemberFaultEvent extends Event {
public String getNetworkPartitionId() {
return networkPartitionId;
}
+
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java
index a9f8829..25feed4 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfLoadAverageEvent.java
@@ -25,12 +25,12 @@ import org.apache.stratos.messaging.event.Event;
* This event is fired by Event processing engine to send gradient of Load average
*/
public class MemberGradientOfLoadAverageEvent extends Event {
- private final String instanceId;
+ private final String clusterInstanceId;
private final String memberId;
private final float value;
- public MemberGradientOfLoadAverageEvent(String instanceId, String memberId, float value) {
- this.instanceId = instanceId;
+ public MemberGradientOfLoadAverageEvent(String clusterInstanceId, String memberId, float value) {
+ this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
this.value = value;
}
@@ -44,7 +44,7 @@ public class MemberGradientOfLoadAverageEvent extends Event {
return value;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfMemoryConsumptionEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfMemoryConsumptionEvent.java
index f9a528a..bf6a25b 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfMemoryConsumptionEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberGradientOfMemoryConsumptionEvent.java
@@ -26,12 +26,12 @@ import org.apache.stratos.messaging.event.Event;
*/
public class MemberGradientOfMemoryConsumptionEvent extends Event {
- private final String instanceId;
+ private final String clusterInstanceId;
private final String memberId;
private final float value;
- public MemberGradientOfMemoryConsumptionEvent(String instanceId, String memberId, float value) {
- this.instanceId = instanceId;
+ public MemberGradientOfMemoryConsumptionEvent(String clusterInstanceId, String memberId, float value) {
+ this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
this.value = value;
}
@@ -45,7 +45,7 @@ public class MemberGradientOfMemoryConsumptionEvent extends Event {
return value;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java
index e4d4b9c..08c5002 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfLoadAverageEvent.java
@@ -26,13 +26,13 @@ import org.apache.stratos.messaging.event.Event;
*/
public class MemberSecondDerivativeOfLoadAverageEvent extends Event {
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final String memberId;
private final float value;
- public MemberSecondDerivativeOfLoadAverageEvent(String clusterId, String instanceId, String memberId, float value) {
+ public MemberSecondDerivativeOfLoadAverageEvent(String clusterId, String clusterInstanceId, String memberId, float value) {
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
this.value = value;
}
@@ -50,7 +50,7 @@ public class MemberSecondDerivativeOfLoadAverageEvent extends Event {
return clusterId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java
index 6d96b0b..8d5dc3a 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/MemberSecondDerivativeOfMemoryConsumptionEvent.java
@@ -25,12 +25,12 @@ import org.apache.stratos.messaging.event.Event;
* This event is fired by Event processing engine to send second derivative of memory consumption
*/
public class MemberSecondDerivativeOfMemoryConsumptionEvent extends Event {
- private final String instanceId;
+ private final String clusterInstanceId;
private final String memberId;
private final float value;
- public MemberSecondDerivativeOfMemoryConsumptionEvent(String instanceId, String memberId, float value) {
- this.instanceId = instanceId;
+ public MemberSecondDerivativeOfMemoryConsumptionEvent(String clusterInstanceId, String memberId, float value) {
+ this.clusterInstanceId = clusterInstanceId;
this.memberId = memberId;
this.value = value;
}
@@ -44,7 +44,7 @@ public class MemberSecondDerivativeOfMemoryConsumptionEvent extends Event {
return value;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java
index 9c565f4..67d78a7 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfLoadAverageEvent.java
@@ -28,13 +28,13 @@ public class SecondDerivativeOfLoadAverageEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
- public SecondDerivativeOfLoadAverageEvent(String networkPartitionId, String clusterId, String instanceId, float value) {
+ public SecondDerivativeOfLoadAverageEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value) {
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
}
@@ -51,7 +51,7 @@ public class SecondDerivativeOfLoadAverageEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java
index 9964842..006d8ba 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfMemoryConsumptionEvent.java
@@ -28,13 +28,13 @@ public class SecondDerivativeOfMemoryConsumptionEvent extends Event {
private final String networkPartitionId;
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final float value;
- public SecondDerivativeOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, String instanceId, float value) {
+ public SecondDerivativeOfMemoryConsumptionEvent(String networkPartitionId, String clusterId, String clusterInstanceId, float value) {
this.networkPartitionId = networkPartitionId;
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.value = value;
}
@@ -51,7 +51,7 @@ public class SecondDerivativeOfMemoryConsumptionEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java
index 735b910..ba0a1ce 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/health/stat/SecondDerivativeOfRequestsInFlightEvent.java
@@ -26,18 +26,17 @@ import org.apache.stratos.messaging.event.Event;
*/
public class SecondDerivativeOfRequestsInFlightEvent extends Event {
private final String clusterId;
- private final String instanceId;
+ private final String clusterInstanceId;
private final String networkPartitionId;
private final float value;
- public SecondDerivativeOfRequestsInFlightEvent(String clusterId, String instanceId, String networkPartitionId, float value) {
+ public SecondDerivativeOfRequestsInFlightEvent(String clusterId, String clusterInstanceId, String networkPartitionId, float value) {
this.clusterId = clusterId;
- this.instanceId = instanceId;
+ this.clusterInstanceId = clusterInstanceId;
this.networkPartitionId = networkPartitionId;
this.value = value;
}
-
public String getClusterId() {
return clusterId;
}
@@ -50,7 +49,7 @@ public class SecondDerivativeOfRequestsInFlightEvent extends Event {
return networkPartitionId;
}
- public String getInstanceId() {
- return instanceId;
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/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 fa0f223..9298af1 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
@@ -125,7 +125,7 @@ class HealthStatisticsPublisher:
stream_def.add_payloaddata_attribute("cluster_id", StreamDefinition.STRING)
- stream_def.add_payloaddata_attribute("instance_id", StreamDefinition.STRING)
+ stream_def.add_payloaddata_attribute("cluster_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)
@@ -142,7 +142,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.cluster_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)
@@ -160,7 +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.cluster_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/da567d07/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 33d7468..cbfadf8 100644
--- a/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
+++ b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
@@ -31,7 +31,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String"/>
- <property name="instance_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"/>
@@ -48,7 +48,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String"/>
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="count" type="double"/>
</payloadData>
@@ -63,7 +63,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String"/>
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="instances_count" type="double"/>
<property name="count" type="double"/>
@@ -80,7 +80,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String"/>
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="average_served_count" type="double"/>
</payloadData>
@@ -95,7 +95,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String"/>
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="count" type="double"/>
</payloadData>
@@ -112,7 +112,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_id" type="String" />
<property name="partition_id" type="String" />
@@ -130,7 +130,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="average_load_average" type="double"/>
</payloadData>
@@ -145,7 +145,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String"/>
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="average_memory_consumption" type="double"/>
</payloadData>
@@ -160,7 +160,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="gradient_load_average" type="double"/>
</payloadData>
@@ -175,7 +175,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="gradient_memory_consumption" type="double"/>
</payloadData>
@@ -190,7 +190,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="second_derivative_memory_consumption" type="double"/>
</payloadData>
@@ -205,7 +205,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="second_derivative_load_average" type="double"/>
</payloadData>
@@ -220,7 +220,7 @@
</correlationData>
<payloadData>
<property name="cluster_id" type="String"/>
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_id" type="String"/>
<property name="partition_id" type="String"/>
@@ -239,7 +239,7 @@
<payloadData>
<property name="member_id" type="String" />
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_average_load_average" type="double"/>
</payloadData>
@@ -255,7 +255,7 @@
<payloadData>
<property name="member_id" type="String"/>
<property name="cluster_id" type="String"/>
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_average_memory_consumption" type="double"/>
</payloadData>
@@ -271,7 +271,7 @@
<payloadData>
<property name="member_id" type="String" />
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_gradient_load_average" type="double"/>
</payloadData>
@@ -287,7 +287,7 @@
<payloadData>
<property name="member_id" type="String" />
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_gradient_memory_consumption" type="double"/>
</payloadData>
@@ -303,7 +303,7 @@
<payloadData>
<property name="member_id" type="String" />
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_second_derivative_memory_consumption" type="double"/>
</payloadData>
@@ -319,7 +319,7 @@
<payloadData>
<property name="member_id" type="String" />
<property name="cluster_id" type="String" />
- <property name="instance_id" type="String"/>
+ <property name="cluster_instance_id" type="String"/>
<property name="network_partition_id" type="String"/>
<property name="member_second_derivative_load_average" type="double"/>
</payloadData>
http://git-wip-us.apache.org/repos/asf/stratos/blob/da567d07/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
index 0f17693..3817577 100644
--- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
+++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
@@ -209,8 +209,8 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run
}
log.info("Publishing member fault event for [member-id] " + memberId);
- MemberFaultEvent memberFaultEvent = new MemberFaultEvent(member.getClusterId(), member.getMemberId(),
- member.getPartitionId(), member.getInstanceId(),
+ MemberFaultEvent memberFaultEvent = new MemberFaultEvent(member.getClusterId(), member.getClusterInstanceId(),
+ member.getMemberId(), member.getPartitionId(), member.getInstanceId(),
member.getNetworkPartitionId(), 0);
memberFaultEventMessageMap.put("message", memberFaultEvent);
[2/2] stratos git commit: Fixing compilation issues caused by the
recent rebase
Posted by im...@apache.org.
Fixing compilation issues caused by the recent rebase
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d45f4fd3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d45f4fd3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d45f4fd3
Branch: refs/heads/master
Commit: d45f4fd35faa8ddb3b03d4962ba8bcffef97aa88
Parents: da567d0
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Dec 21 04:04:23 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Dec 21 04:04:23 2014 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV41Utils.java | 4 +-
.../util/converter/ObjectConverter.java | 94 ++++++++++++++++----
2 files changed, 78 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d45f4fd3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index e01e557..db68bd5 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -402,7 +402,7 @@ public class StratosApiV41Utils {
String message = e.getMessage();
log.error(message, e);
throw new RestAPIException(message, e);
- } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
+ } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
String message = e.getMessage();
log.error(message, e);
throw new RestAPIException(message, e);
@@ -880,7 +880,7 @@ public class StratosApiV41Utils {
throw new RestAPIException(e);
} catch (ADCException e) {
throw new RestAPIException(e);
- } catch (CloudControllerServiceUnregisteredCartridgeExceptionException e) {
+ } catch (CloudControllerServiceCartridgeNotFoundExceptionException e) {
throw new RestAPIException(e);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d45f4fd3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index 7363410..7153232 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -27,6 +27,7 @@ import org.apache.stratos.autoscaler.stub.pojo.*;
import org.apache.stratos.cloud.controller.stub.domain.*;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.Property;
+import org.apache.stratos.common.beans.ApplicationBean;
import org.apache.stratos.common.beans.GroupBean;
import org.apache.stratos.common.beans.autoscaler.partition.ApplicationLevelNetworkPartition;
import org.apache.stratos.common.beans.autoscaler.partition.Partition;
@@ -1373,39 +1374,57 @@ public class ObjectConverter {
}
- public static ApplicationBean convertApplicationToApplicationBean(Application application) {
+ public static ApplicationInfoBean convertApplicationToApplicationBean(Application application) {
if (application == null) {
return null;
}
- ApplicationBean applicationBean = new ApplicationBean();
+ ApplicationInfoBean applicationBean = new ApplicationInfoBean();
applicationBean.setId(application.getUniqueIdentifier());
applicationBean.setName(application.getName());
applicationBean.setDescription(application.getDescription());
applicationBean.setTenantDomain(application.getTenantDomain());
applicationBean.setTenantAdminUsername(application.getTenantAdminUserName());
- applicationBean.setInstances(convertApplicationInstancesToInstances(application));
+ //applicationBean.set(convertApplicationToApplicationInstanceBean(application));
return applicationBean;
}
- private static List<Instance> convertApplicationInstancesToInstances(
+ public static ApplicationInfoBean convertApplicationToApplicationInstanceBean(Application application) {
+ if (application == null) {
+ return null;
+ }
+
+ ApplicationInfoBean applicationBean = new
+ ApplicationInfoBean();
+ applicationBean.setId(application.getUniqueIdentifier());
+ applicationBean.setName(application.getName());
+ applicationBean.setDescription(application.getDescription());
+ applicationBean.setTenantDomain(application.getTenantDomain());
+ applicationBean.setTenantAdminUsername(application.getTenantAdminUserName());
+ applicationBean.setApplicationInstances(convertApplicationInstancesToApplicationInstances(application));
+ return applicationBean;
+ }
+
+ private static List<ApplicationInstanceBean> convertApplicationInstancesToApplicationInstances(
Application application) {
- List<Instance> applicationInstanceList = new ArrayList<Instance>();
- Collection<ApplicationInstance> applicationInstancesInTopology =
- application.getInstanceIdToInstanceContextMap().values();
-
- if(applicationInstancesInTopology != null) {
- for (ApplicationInstance applicationInstance : applicationInstancesInTopology) {
- Instance instance = new Instance();
- instance.setInstanceId(applicationInstance.getInstanceId());
- instance.setStatus(applicationInstance.getStatus().toString());
- applicationInstanceList.add(instance);
+ List<ApplicationInstanceBean> applicationInstanceList = new ArrayList<ApplicationInstanceBean>();
+ Collection<ApplicationInstance> applicationInstancesInTopology =
+ application.getInstanceIdToInstanceContextMap().values();
+
+ if (applicationInstancesInTopology != null) {
+ for (ApplicationInstance applicationInstance : applicationInstancesInTopology) {
+ ApplicationInstanceBean instance = new ApplicationInstanceBean();
+ instance.setInstanceId(applicationInstance.getInstanceId());
+ instance.setApplicationId(application.getUniqueIdentifier());
+ instance.setParentInstanceId(applicationInstance.getParentId());
+ instance.setStatus(applicationInstance.getStatus().toString());
+ applicationInstanceList.add(instance);
}
- }
- return applicationInstanceList;
+ }
+ return applicationInstanceList;
}
- public static GroupBean convertGroupToGroupBean(Group group) {
+ public static GroupBean convertGroupToGroupBean(Group group) {
if (group == null) {
return null;
}
@@ -1417,7 +1436,46 @@ public class ObjectConverter {
return groupBean;
}
- private static List<Instance> convertGroupInstancesToInstances(Group group) {
+ public static List<GroupInstanceBean> convertGroupToGroupInstancesBean(String instanceId, Group group) {
+ if (group == null) {
+ return null;
+ }
+
+ List<GroupInstanceBean> groupInstanceBeans = new ArrayList<GroupInstanceBean>();
+ if (group.getInstanceContexts(instanceId) != null) {
+ GroupInstance groupInstance = group.getInstanceContexts(instanceId);
+ GroupInstanceBean groupInstanceBean = new GroupInstanceBean();
+ groupInstanceBean.setParentInstanceId(instanceId);
+ groupInstanceBean.setInstanceId(groupInstance.getInstanceId());
+ groupInstanceBean.setStatus(groupInstance.getStatus().toString());
+ groupInstanceBean.setGroupId(group.getUniqueIdentifier());
+ /*for(Group group1 : group.getGroups()) {
+ groupInstanceBean.setGroupInstances(convertGroupToGroupInstancesBean(
+ groupInstance.getInstanceId(), group1));
+ }*/
+ groupInstanceBeans.add(groupInstanceBean);
+
+ } else {
+ List<org.apache.stratos.messaging.domain.instance.Instance> groupInstances =
+ group.getInstanceContextsWithParentId(instanceId);
+ for (org.apache.stratos.messaging.domain.instance.Instance groupInstance : groupInstances) {
+ GroupInstanceBean groupInstanceBean = new GroupInstanceBean();
+ groupInstanceBean.setParentInstanceId(instanceId);
+ groupInstanceBean.setInstanceId(groupInstance.getInstanceId());
+ groupInstanceBean.setStatus(((GroupInstance) groupInstance).getStatus().toString());
+ groupInstanceBean.setGroupId(group.getUniqueIdentifier());
+ /*for(Group group1 : group.getGroups()) {
+ groupInstanceBean.setGroupInstances(convertGroupToGroupInstancesBean(
+ groupInstance.getInstanceId(), group1));
+ }*/
+ groupInstanceBeans.add(groupInstanceBean);
+ }
+ }
+
+ return groupInstanceBeans;
+ }
+
+ private static List<Instance> convertGroupInstancesToInstances(Group group) {
List<Instance> instanceList = new ArrayList<Instance>();
Collection<GroupInstance> instancesInTopology = group.getInstanceIdToInstanceContextMap().values();
if(instancesInTopology != null) {