Add instance id to the payload
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d705ee19 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d705ee19 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d705ee19 Branch: refs/heads/master Commit: d705ee19afa51c1bc64de8f5fe27dd4c593e0294 Parents: 4616888 Author: gayan <[email protected]> Authored: Wed Dec 3 11:12:56 2014 +0530 Committer: gayan <[email protected]> Committed: Wed Dec 3 11:12:56 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/client/CloudControllerClient.java | 3 ++- .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 2 +- .../controller/services/impl/CloudControllerServiceImpl.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d705ee19/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java index 4119c34..bb16bb6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java @@ -169,7 +169,7 @@ public class CloudControllerClient { public synchronized MemberContext spawnAnInstance(Partition partition, String clusterId, - String networkPartitionId, boolean isPrimary, + String networkPartitionId,String instanceID, boolean isPrimary, int minMemberCount) throws SpawningException { try { if (log.isInfoEnabled()) { @@ -186,6 +186,7 @@ public class CloudControllerClient { MemberContext member = new MemberContext(); member.setClusterId(clusterId); member.setPartition(partition); + member.setInstanceId(instanceID); // member.setLbClusterId(lbClusterId); member.setObsoleteExpiryTime(expiryTime); member.setInitTime(System.currentTimeMillis()); http://git-wip-us.apache.org/repos/asf/stratos/blob/d705ee19/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index e4c82ba..6c58244 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -194,7 +194,7 @@ public class RuleTasksDelegator { CloudControllerClient.getInstance() .spawnAnInstance(clusterMonitorPartitionContext.getPartition(), clusterId, -// lbClusterId, + instanceId, clusterMonitorPartitionContext.getNetworkPartitionId(), isPrimary, minimumCountOfNetworkPartition); http://git-wip-us.apache.org/repos/asf/stratos/blob/d705ee19/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index f165a00..321822c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -410,6 +410,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { addToPayload(payload, "LB_CLUSTER_ID", memberContext.getLbClusterId()); addToPayload(payload, "NETWORK_PARTITION_ID", memberContext.getNetworkPartitionId()); addToPayload(payload, "PARTITION_ID", partitionId); + addToPayload(payload, "INSTANCE_ID", memberContext.getInstanceId()); if (memberContext.getProperties() != null) { org.apache.stratos.common.Properties properties = memberContext.getProperties(); if (properties != null) {
