Updated Branches: refs/heads/master a1e7acb3a -> 98f9ba35d
fixing member removal order Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/af8cba06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/af8cba06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/af8cba06 Branch: refs/heads/master Commit: af8cba0678888f007fa69dd7102ac7fd76c4576c Parents: 469b8c6 Author: Nirmal Fernando <[email protected]> Authored: Thu Feb 13 00:38:38 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Feb 13 00:38:38 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/impl/CloudControllerServiceImpl.java | 6 +++--- .../cloud/controller/validate/AWSEC2PartitionValidator.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/af8cba06/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index a6abb18..eeaebf7 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -850,9 +850,6 @@ public class CloudControllerServiceImpl implements CloudControllerService { //updating the topology TopologyBuilder.handleMemberTerminated(memberContext.getCartridgeType(), memberContext.getClusterId(), memberContext.getNetworkPartitionId(), memberContext.getPartition().getId(), memberContext.getMemberId()); - // update data holders - dataHolder.removeMemberContext(memberContext.getMemberId(), memberContext.getClusterId()); - //publishing data CartridgeInstanceDataPublisher.publish(memberContext.getMemberId(), memberContext.getPartition().getId(), @@ -862,6 +859,9 @@ public class CloudControllerServiceImpl implements CloudControllerService { MemberStatus.Terminated.toString(), null); + // update data holders + dataHolder.removeMemberContext(memberContext.getMemberId(), memberContext.getClusterId()); + // persist persist(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/af8cba06/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java index 8360f45..fe480ac 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java @@ -62,7 +62,7 @@ public class AWSEC2PartitionValidator implements PartitionValidator { IaasProvider updatedIaasProvider = new IaasProvider(iaasProvider); - Iaas updatedIaas = CloudControllerUtil.setIaas(updatedIaasProvider); + Iaas updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider); updatedIaas.setIaasProvider(updatedIaasProvider); if (properties.containsKey(Scope.zone.toString())) {
