Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 57d497dc4 -> 27ba632f2
Adding instance id to member objects in the topology Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6a16dde5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6a16dde5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6a16dde5 Branch: refs/heads/stratos-4.1.x Commit: 6a16dde51902f137cbe443c3c4542922aaddceae Parents: 57d497d Author: Imesh Gunaratne <[email protected]> Authored: Thu Oct 22 11:42:49 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Oct 22 12:40:53 2015 +0530 ---------------------------------------------------------------------- .../messaging/publisher/TopologyEventPublisher.java | 3 ++- .../cloud/controller/messaging/topology/TopologyBuilder.java | 3 ++- .../messaging/event/topology/MemberInitializedEvent.java | 8 +++++++- .../topology/MemberInitializedMessageProcessor.java | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6a16dde5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java index 7225a61..b55d3a2 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java @@ -171,7 +171,8 @@ public class TopologyEventPublisher { memberContext.getClusterInstanceId(), memberContext.getMemberId(), memberContext.getNetworkPartitionId(), - memberContext.getPartition().getId()); + memberContext.getPartition().getId(), + memberContext.getInstanceId()); memberInitializedEvent.setDefaultPrivateIP(memberContext.getDefaultPrivateIP()); if (memberContext.getPrivateIPs() != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/6a16dde5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index 4351986..09670e0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java @@ -346,7 +346,6 @@ public class TopologyBuilder { member.setStatus(MemberStatus.Created); member.setLbClusterId(lbClusterId); member.setProperties(CloudControllerUtil.toJavaUtilProperties(memberContext.getProperties())); - member.setInstanceId(memberContext.getInstanceId()); cluster.addMember(member); TopologyManager.updateTopology(topology); @@ -400,6 +399,8 @@ public class TopologyBuilder { try { TopologyManager.acquireWriteLock(); + // Set instance id returned by the IaaS + member.setInstanceId(memberContext.getInstanceId()); // Set ip addresses member.setDefaultPrivateIP(memberContext.getDefaultPrivateIP()); if (memberContext.getPrivateIPs() != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/6a16dde5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberInitializedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberInitializedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberInitializedEvent.java index edf64e3..07b1f02 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberInitializedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberInitializedEvent.java @@ -36,6 +36,7 @@ public class MemberInitializedEvent extends TopologyEvent implements Serializabl private final String networkPartitionId; private final String partitionId; private final String memberId; + private final String instanceId; private List<String> memberPublicIPs; private String defaultPublicIP; @@ -44,13 +45,14 @@ public class MemberInitializedEvent extends TopologyEvent implements Serializabl private Properties properties; public MemberInitializedEvent(String serviceName, String clusterId, String clusterInstanceId, String memberId, - String networkPartitionId, String partitionId) { + String networkPartitionId, String partitionId, String instanceId) { this.serviceName = serviceName; this.clusterId = clusterId; this.clusterInstanceId = clusterInstanceId; this.memberId = memberId; this.networkPartitionId = networkPartitionId; this.partitionId = partitionId; + this.instanceId = instanceId; } public String getServiceName() { @@ -116,4 +118,8 @@ public class MemberInitializedEvent extends TopologyEvent implements Serializabl public void setMemberPrivateIPs(List<String> memberPrivateIPs) { this.memberPrivateIPs = memberPrivateIPs; } + + public String getInstanceId() { + return instanceId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/6a16dde5/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java index 57d0680..82b0caa 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java @@ -136,16 +136,18 @@ public class MemberInitializedMessageProcessor extends MessageProcessor { log.error("Invalid state transition from " + member.getStatus() + " to " + MemberStatus.Initialized); } member.setStatus(MemberStatus.Initialized); + member.setInstanceId(event.getInstanceId()); member.setDefaultPublicIP(event.getDefaultPublicIP()); member.setMemberPublicIPs(event.getMemberPublicIPs()); member.setDefaultPrivateIP(event.getDefaultPrivateIP()); member.setMemberPrivateIPs(event.getMemberPrivateIPs()); if (log.isInfoEnabled()) { - log.info(String.format("Member initialized: [service] %s [cluster] %s [member] %s", + log.info(String.format("Member initialized: [service] %s [cluster] %s [member] %s [instance-id] %s", event.getServiceName(), event.getClusterId(), - event.getMemberId())); + event.getMemberId(), + event.getInstanceId())); } }
