Repository: stratos Updated Branches: refs/heads/master c20d28c24 -> 4ed5e0040
PartitionContext inheritance for GroupLevelPartitionContext Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4ed5e004 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4ed5e004 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4ed5e004 Branch: refs/heads/master Commit: 4ed5e0040618ef6b8418898fe31b46b6e9608894 Parents: c20d28c Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Nov 28 14:27:13 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Nov 28 14:27:13 2014 +0530 ---------------------------------------------------------------------- .../partition/GroupLevelPartitionContext.java | 22 +++----------------- .../context/partition/PartitionContext.java | 11 +++++++++- 2 files changed, 13 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4ed5e004/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java index c403295..d08bbb6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java @@ -36,15 +36,13 @@ import java.util.concurrent.ConcurrentHashMap; * Holds information about a partition. */ -public class GroupLevelPartitionContext implements Serializable { +public class GroupLevelPartitionContext extends PartitionContext implements Serializable { private static final long serialVersionUID = -2920388667345980487L; private static final Log log = LogFactory.getLog(GroupLevelPartitionContext.class); private final int PENDING_MEMBER_FAILURE_THRESHOLD = 5; private String partitionId; private String serviceName; - private String networkPartitionId; - private Partition partition; private int minimumInstanceCount = 0; private int pendingInstancesFailureCount = 0; // properties @@ -82,12 +80,14 @@ public class GroupLevelPartitionContext implements Serializable { // for the use of tests public GroupLevelPartitionContext(long instanceExpiryTime) { + super(instanceExpiryTime); this.activeInstances = new ArrayList<Instance>(); this.terminationPendingInstances = new ArrayList<Instance>(); pendingInstanceExpiryTime = instanceExpiryTime; } public GroupLevelPartitionContext(Partition partition) { + super(partition); this.setPartition(partition); this.minimumInstanceCount = partition.getPartitionMin(); this.partitionId = partition.getId(); @@ -162,14 +162,6 @@ public class GroupLevelPartitionContext implements Serializable { this.minimumInstanceCount = minimumInstanceCount; } - public Partition getPartition() { - return partition; - } - - public void setPartition(Partition partition) { - this.partition = partition; - } - public void addPendingInstance(Instance ctxt) { this.pendingInstances.add(ctxt); } @@ -405,14 +397,6 @@ public class GroupLevelPartitionContext implements Serializable { this.obsoletedInstances = obsoletedInstances; } - public String getNetworkPartitionId() { - return networkPartitionId; - } - - public void setNetworkPartitionId(String networkPartitionId) { - this.networkPartitionId = networkPartitionId; - } - public Map<String, MemberStatsContext> getInstanceStatsContexts() { return instanceStatsContexts; } http://git-wip-us.apache.org/repos/asf/stratos/blob/4ed5e004/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java index 7247e40..01aeabb 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java @@ -37,7 +37,7 @@ public class PartitionContext implements Serializable{ private static final Log log = LogFactory.getLog(ClusterLevelPartitionContext.class); protected String partitionId; private Partition partition; - + private String networkPartitionId; // properties private Properties properties; @@ -62,10 +62,19 @@ public class PartitionContext implements Serializable{ public String getPartitionId() { return partitionId; } + public void setPartitionId(String partitionId) { this.partitionId = partitionId; } + public String getNetworkPartitionId() { + return networkPartitionId; + } + + public void setNetworkPartitionId(String networkPartitionId) { + this.networkPartitionId = networkPartitionId; + } + public int getCurrentElementCount() { //TODO find and return correct member instance count return 0;
