Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 2fd1d8035 -> 56be6fc4e
Fixing to remoe the memberstats context when remove the pending members Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/56be6fc4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/56be6fc4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/56be6fc4 Branch: refs/heads/stratos-4.1.x Commit: 56be6fc4e060c3c4dd26732186b222f86a557b0a Parents: 2fd1d80 Author: gayangunarathne <[email protected]> Authored: Thu Oct 8 19:25:15 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Thu Oct 8 19:25:15 2015 +0530 ---------------------------------------------------------------------- .../context/partition/ClusterLevelPartitionContext.java | 5 +++-- .../stratos/autoscaler/monitor/cluster/ClusterMonitor.java | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/56be6fc4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java index 69dba49..cd71f77 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java @@ -18,7 +18,6 @@ */ package org.apache.stratos.autoscaler.context.partition; -import org.apache.axis2.AxisFault; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,7 +25,6 @@ import org.apache.stratos.autoscaler.client.AutoscalerCloudControllerClient; import org.apache.stratos.autoscaler.context.member.MemberStatsContext; import org.apache.stratos.autoscaler.util.ConfUtil; import org.apache.stratos.cloud.controller.stub.domain.MemberContext; -import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.common.partition.PartitionRef; import org.apache.stratos.messaging.domain.instance.ClusterInstance; @@ -208,6 +206,9 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se MemberContext pendingMember = iterator.next(); if (id.equals(pendingMember.getMemberId())) { iterator.remove(); + if (memberStatsContexts.get(pendingMember.getMemberId()) != null) { + memberStatsContexts.remove(pendingMember.getMemberId()); + } return true; } http://git-wip-us.apache.org/repos/asf/stratos/blob/56be6fc4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index c2dd411..28c2d95 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -1331,6 +1331,9 @@ public class ClusterMonitor extends Monitor { log.debug("Moving pending member [member id] " + memberId + " to obsolete list"); } partitionContext.movePendingMemberToObsoleteMembers(memberId); + if (partitionContext.getMemberStatsContext(memberId) != null) { + partitionContext.removeMemberStatsContext(memberId); + } } allMovedToObsolete = partitionContext.getTotalMemberCount() == 0;
