Repository: stratos Updated Branches: refs/heads/master 4a187d12d -> 5e7835dbd
adding new constructor to handle group level stuffs Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5e7835db Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5e7835db Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5e7835db Branch: refs/heads/master Commit: 5e7835dbd100cbce020d157ee993daa5aec3c679 Parents: 4a187d1 Author: reka <[email protected]> Authored: Fri Dec 5 11:28:29 2014 +0530 Committer: reka <[email protected]> Committed: Fri Dec 5 11:28:48 2014 +0530 ---------------------------------------------------------------------- .../context/partition/GroupLevelPartitionContext.java | 9 +++------ .../autoscaler/context/partition/PartitionContext.java | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5e7835db/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 dfb1225..3b41986 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 @@ -85,11 +85,8 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri pendingInstanceExpiryTime = instanceExpiryTime; } - public GroupLevelPartitionContext(int max, Partition partition, String networkPartitionIid ) { - super(max, partition, networkPartitionIid); - this.setPartition(partition); - this.minimumInstanceCount = partition.getPartitionMin(); - this.partitionId = partition.getId(); + public GroupLevelPartitionContext(int max, String partitionId, String networkPartitionIid ) { + super(max, partitionId, networkPartitionIid); this.pendingInstances = new ArrayList<Instance>(); this.activeInstances = new ArrayList<Instance>(); this.terminationPendingInstances = new ArrayList<Instance>(); @@ -107,7 +104,7 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri log.debug("Instance obsoleted expiry time is set to: " + obsoltedInstanceExpiryTime); } - /*FIXME Thread th = new Thread(new PendingInstanceWatcher(this)); + /*Thread th = new Thread(new PendingInstanceWatcher(this)); th.start(); Thread th2 = new Thread(new ObsoletedInstanceWatcher(this)); th2.start(); http://git-wip-us.apache.org/repos/asf/stratos/blob/5e7835db/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 ad6174f..167caea 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 @@ -53,6 +53,12 @@ public abstract class PartitionContext implements Serializable { this.networkPartitionId = networkPartitionId; } + public PartitionContext(int max, String partitionId, String networkPartitionId) { + this.max = max; + this.partitionId = partitionId; + this.networkPartitionId = networkPartitionId; + } + public Partition getPartition() { return partition; }
