Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 08d68656f -> 5196529d4
fixing a concurrent modification issue in PartitionContext Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5196529d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5196529d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5196529d Branch: refs/heads/4.0.0-grouping Commit: 5196529d41c0b56c3c362f5f547191e4ba237129 Parents: 08d6865 Author: Isuru Haththotuwa <[email protected]> Authored: Wed Oct 29 18:22:26 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Wed Oct 29 18:22:26 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/autoscaler/PartitionContext.java | 6 +++--- .../stratos/autoscaler/monitor/AbstractClusterMonitor.java | 3 +-- .../apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5196529d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java index 613aa4f..d0886a3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java @@ -88,9 +88,9 @@ public class PartitionContext implements Serializable{ this.setPartition(partition); this.minimumMemberCount = partition.getPartitionMin(); this.partitionId = partition.getId(); - this.pendingMembers = new ArrayList<MemberContext>(); - this.activeMembers = new ArrayList<MemberContext>(); - this.terminationPendingMembers = new ArrayList<MemberContext>(); + this.pendingMembers = new CopyOnWriteArrayList<MemberContext>(); + this.activeMembers = new CopyOnWriteArrayList<MemberContext>(); + this.terminationPendingMembers = new CopyOnWriteArrayList<MemberContext>(); this.obsoletedMembers = new CopyOnWriteArrayList<String>(); memberStatsContexts = new ConcurrentHashMap<String, MemberStatsContext>(); http://git-wip-us.apache.org/repos/asf/stratos/blob/5196529d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java index da4cba8..fb23985 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java @@ -228,8 +228,7 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable } public void setStatus(ClusterStatus status) { - log.info(String.format("[Monitor] %s is notifying the parent" + - "on its state change from %s to %s", clusterId, this.status, status)); + //if(this.status != status) { this.status = status; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/5196529d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java index 0f213a9..b42e840 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java @@ -144,8 +144,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler * @param status */ public void setStatus(GroupStatus status) { - log.info(String.format("[Monitor] %s is notifying the parent" + - "on its state change from %s to %s", id, this.status, status)); + //if(this.status != status) { this.status = status; //notifying the parent
