Updated Branches: refs/heads/master f28234b28 -> a07747732
Added network partition id to instance status management topology events Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ee2f175e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ee2f175e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ee2f175e Branch: refs/heads/master Commit: ee2f175ea6571da84dad135ac2b20f128c9bda18 Parents: 787d8b1 Author: Imesh Gunaratne <[email protected]> Authored: Thu Dec 12 23:36:01 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Dec 12 23:36:01 2013 +0530 ---------------------------------------------------------------------- .../topology/TopologyEventSender.java | 20 +++++++++++--------- .../instance/status/InstanceActivatedEvent.java | 8 +++++++- .../instance/status/InstanceStartedEvent.java | 8 +++++++- 3 files changed, 25 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2f175e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java index 49ecb2c..0a21df6 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java @@ -107,35 +107,37 @@ public class TopologyEventSender { } - public static void sendInstanceSpawnedEvent(String serviceName, String clusterId, String partitionId, String memberId) { - InstanceSpawnedEvent instanceSpawnedEvent = new InstanceSpawnedEvent(serviceName, clusterId, partitionId, memberId); + public static void sendInstanceSpawnedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { + InstanceSpawnedEvent instanceSpawnedEvent = new InstanceSpawnedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId); if(log.isInfoEnabled()) { - log.info(String.format("Publishing instance spawned event: [service] %s [cluster] %s [partition] %s [member] %s", serviceName, clusterId, partitionId, memberId)); + log.info(String.format("Publishing instance spawned event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", serviceName, clusterId, networkPartitionId, partitionId, memberId)); } publishEvent(instanceSpawnedEvent); } public static void sendMemberStartedEvent(InstanceStartedEvent instanceStartedEvent) { MemberStartedEvent memberStartedEventTopology = new MemberStartedEvent(instanceStartedEvent.getServiceName(), - instanceStartedEvent.getClusterId(), instanceStartedEvent.getMemberId()); + instanceStartedEvent.getClusterId(), instanceStartedEvent.getNetworkPartitionId(), instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId()); if(log.isInfoEnabled()) { - log.info(String.format("Publishing member started event: [service] %s [cluster] %s [member] %s", instanceStartedEvent.getServiceName(), instanceStartedEvent.getClusterId(), instanceStartedEvent.getMemberId())); + log.info(String.format("Publishing member started event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", + instanceStartedEvent.getServiceName(), instanceStartedEvent.getClusterId(), instanceStartedEvent.getNetworkPartitionId(), instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId())); } publishEvent(memberStartedEventTopology); } public static void sendMemberActivatedEvent(MemberActivatedEvent memberActivatedEvent) { if(log.isInfoEnabled()) { - log.info(String.format("Publishing member activated event: [service] %s [cluster] %s [member] %s", memberActivatedEvent.getServiceName(), memberActivatedEvent.getClusterId(), memberActivatedEvent.getMemberId())); + log.info(String.format("Publishing member activated event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", + memberActivatedEvent.getServiceName(), memberActivatedEvent.getClusterId(), memberActivatedEvent.getNetworkPartitionId(), memberActivatedEvent.getPartitionId(), memberActivatedEvent.getMemberId())); } publishEvent(memberActivatedEvent); } - public static void sendMemberTerminatedEvent(String serviceName, String clusterId, String partitionId, String memberId) { - MemberTerminatedEvent memberTerminatedEvent = new MemberTerminatedEvent(serviceName, clusterId, partitionId, memberId); + public static void sendMemberTerminatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { + MemberTerminatedEvent memberTerminatedEvent = new MemberTerminatedEvent(serviceName, clusterId, networkPartitionId, partitionId, memberId); if(log.isInfoEnabled()) { - log.info(String.format("Publishing member terminated event: [service] %s [cluster] %s [partition] %s [member] %s", serviceName, clusterId, partitionId, memberId)); + log.info(String.format("Publishing member terminated event: [service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", serviceName, clusterId, networkPartitionId, partitionId, memberId)); } publishEvent(memberTerminatedEvent); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2f175e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java index 003cf68..dd16ff9 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java @@ -32,12 +32,14 @@ public class InstanceActivatedEvent extends TopologyEvent implements Serializabl private final String serviceName; private final String clusterId; + private final String networkPartitionId; private final String partitionId; private final String memberId; - public InstanceActivatedEvent(String serviceName, String clusterId, String partitionId, String memberId) { + public InstanceActivatedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; this.partitionId = partitionId; this.memberId = memberId; } @@ -57,4 +59,8 @@ public class InstanceActivatedEvent extends TopologyEvent implements Serializabl public String getMemberId() { return memberId; } + + public String getNetworkPartitionId() { + return networkPartitionId; + } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee2f175e/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java index 1bee5a3..5722744 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java @@ -31,12 +31,14 @@ public class InstanceStartedEvent extends TopologyEvent implements Serializable private final String serviceName; private final String clusterId; + private final String networkPartitionId; private final String partitionId; private final String memberId; - public InstanceStartedEvent(String serviceName, String clusterId, String partitionId, String memberId) { + public InstanceStartedEvent(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId) { this.serviceName = serviceName; this.clusterId = clusterId; + this.networkPartitionId = networkPartitionId; this.partitionId = partitionId; this.memberId = memberId; } @@ -56,4 +58,8 @@ public class InstanceStartedEvent extends TopologyEvent implements Serializable public String getMemberId() { return memberId; } + + public String getNetworkPartitionId() { + return networkPartitionId; + } }
