You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/13 18:29:13 UTC
[2/2] stratos git commit: Adding cluster id to cluster level
partition context
Adding cluster id to cluster level partition context
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/be88f386
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/be88f386
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/be88f386
Branch: refs/heads/4.1.0-test
Commit: be88f386cacbc1b1b32f0be28951b33263a8f2dc
Parents: 1775ff7
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Dec 13 23:00:23 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Dec 13 23:01:14 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/context/cluster/VMClusterContext.java | 2 +-
.../context/partition/ClusterLevelPartitionContext.java | 4 +++-
.../autoscaler/context/partition/GroupLevelPartitionContext.java | 3 ---
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/be88f386/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
index 62de41c..16935c0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
@@ -278,7 +278,7 @@ public class VMClusterContext extends AbstractClusterContext {
ClusterLevelPartitionContext clusterLevelPartitionContext = new ClusterLevelPartitionContext(
maxInstances,
partition,
- clusterInstance.getNetworkPartitionId());
+ clusterInstance.getNetworkPartitionId(), clusterId);
clusterLevelPartitionContext.setServiceName(cluster.getServiceName());
clusterLevelPartitionContext.setProperties(cluster.getProperties());
http://git-wip-us.apache.org/repos/asf/stratos/blob/be88f386/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 f3f5046..547aca7 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
@@ -43,6 +43,7 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
private static final Log log = LogFactory.getLog(ClusterLevelPartitionContext.class);
private final int PENDING_MEMBER_FAILURE_THRESHOLD = 5;
private String serviceName;
+ private String clusterId;
private int minimumMemberCount = 0;
private int pendingMembersFailureCount = 0;
// properties
@@ -82,9 +83,10 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
this.pendingMembers = new ArrayList<MemberContext>();
}
- public ClusterLevelPartitionContext(int max, Partition partition, String networkPartitionId) {
+ public ClusterLevelPartitionContext(int max, Partition partition, String networkPartitionId, String clusterId) {
super(max, partition, networkPartitionId);
+ this.clusterId = clusterId;
this.pendingMembers = new ArrayList<MemberContext>();
this.activeMembers = new ArrayList<MemberContext>();
this.terminationPendingMembers = new ArrayList<MemberContext>();
http://git-wip-us.apache.org/repos/asf/stratos/blob/be88f386/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 1f5555d..ccb8cfe 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
@@ -21,11 +21,8 @@ package org.apache.stratos.autoscaler.context.partition;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.autoscaler.context.group.GroupInstanceContext;
import org.apache.stratos.autoscaler.context.member.MemberStatsContext;
-import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.ChildLevelPartition;
import org.apache.stratos.autoscaler.util.ConfUtil;
-import org.apache.stratos.cloud.controller.stub.domain.Partition;
import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.messaging.domain.instance.Instance;