Repository: stratos Updated Branches: refs/heads/master 539dc6cf1 -> dfe8fab2e
Fixing container removal logic. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dfe8fab2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dfe8fab2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dfe8fab2 Branch: refs/heads/master Commit: dfe8fab2ecaa265fad5f34b16b0e0c11addd3b3d Parents: 539dc6c Author: Nirmal Fernando <[email protected]> Authored: Sun Oct 12 11:37:24 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sun Oct 12 11:37:24 2014 +0530 ---------------------------------------------------------------------- .../controller/impl/CloudControllerServiceImpl.java | 12 ++++++------ .../cloud/controller/topology/TopologyBuilder.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/dfe8fab2/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 5461bc2..94f47a9 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 @@ -1624,16 +1624,16 @@ public class CloudControllerServiceImpl implements CloudControllerService { + StratosConstants.ALLOCATED_SERVICE_HOST_PORT); } - List<MemberContext> removedMembers = dataHolder.removeMemberContextsOfCluster(clusterId); + List<MemberContext> membersToBeRemoved = dataHolder.getMemberContextsOfClusterId(clusterId); - for (MemberContext memberContext : removedMembers) { + for (MemberContext memberContext : membersToBeRemoved) { logTermination(memberContext); } // persist persist(); - return removedMembers.toArray(new MemberContext[0]); + return membersToBeRemoved.toArray(new MemberContext[0]); } @Override @@ -1815,11 +1815,11 @@ public class CloudControllerServiceImpl implements CloudControllerService { // member id = pod id kubApi.deletePod(memberId); - MemberContext removedMemberContext = dataHolder.removeMemberContext(memberId, clusterId); + MemberContext memberToBeRemoved = dataHolder.getMemberContextOfMemberId(memberId); - logTermination(removedMemberContext); + logTermination(memberToBeRemoved); - return removedMemberContext; + return memberToBeRemoved; } catch (KubernetesClientException e) { String msg = String.format("Failed to terminate member [Member id] %s", memberId); http://git-wip-us.apache.org/repos/asf/stratos/blob/dfe8fab2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index a10f2bb..2c7b77b 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -482,7 +482,7 @@ public class TopologyBuilder { Member member = cluster.getMember(memberId); if (member == null) { - log.warn(String.format("Member with nodeID %s does not exist", + log.warn(String.format("Member with member id %s does not exist", memberId)); return; }
