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:12 UTC
[1/2] stratos git commit: s/upperLimit/threshold in stratos manager
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 1775ff77f -> 63073a6f8
s/upperLimit/threshold in stratos manager
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/63073a6f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/63073a6f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/63073a6f
Branch: refs/heads/4.1.0-test
Commit: 63073a6f82fa4373c4bc01e8e905152690b257ce
Parents: be88f38
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Dec 13 23:00:59 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Dec 13 23:01:14 2014 +0530
----------------------------------------------------------------------
.../policy/autoscale/LoadAverageThresholds.java | 2 +-
.../policy/autoscale/MemoryConsumptionThresholds.java | 2 +-
.../policy/autoscale/RequestsInFlightThresholds.java | 2 +-
.../endpoint/bean/util/converter/PojoConverter.java | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/63073a6f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/LoadAverageThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/LoadAverageThresholds.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/LoadAverageThresholds.java
index ee85353..ebda721 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/LoadAverageThresholds.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/LoadAverageThresholds.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class LoadAverageThresholds {
- public float upperLimit;
+ public float threshold;
public float lowerLimit;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/63073a6f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
index 261f07c..cffacc0 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/MemoryConsumptionThresholds.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class MemoryConsumptionThresholds {
- public float upperLimit;
+ public float threshold;
public float lowerLimit;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/63073a6f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/RequestsInFlightThresholds.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
index d894169..0df4d07 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/RequestsInFlightThresholds.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class RequestsInFlightThresholds {
- public float upperLimit;
+ public float threshold;
public float lowerLimit;
http://git-wip-us.apache.org/repos/asf/stratos/blob/63073a6f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index 53557f1..be62999 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@ -388,7 +388,7 @@ public class PojoConverter {
//set load average information
org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds loadAverage = new
org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds();
- loadAverage.setUpperLimit(autoscalePolicyBean.getLoadThresholds().loadAverage.upperLimit);
+ loadAverage.setUpperLimit(autoscalePolicyBean.getLoadThresholds().loadAverage.threshold);
loadAverage.setLowerLimit(autoscalePolicyBean.getLoadThresholds().loadAverage.lowerLimit);
//set load average
loadThresholds.setLoadAverage(loadAverage);
@@ -398,7 +398,7 @@ public class PojoConverter {
org.apache.stratos.autoscaler.stub.autoscale.policy.RequestsInFlightThresholds requestsInFlight = new
org.apache.stratos.autoscaler.stub.autoscale.policy.RequestsInFlightThresholds();
//set request in flight information
- requestsInFlight.setUpperLimit(autoscalePolicyBean.getLoadThresholds().requestsInFlight.upperLimit);
+ requestsInFlight.setUpperLimit(autoscalePolicyBean.getLoadThresholds().requestsInFlight.threshold);
requestsInFlight.setLowerLimit(autoscalePolicyBean.getLoadThresholds().requestsInFlight.lowerLimit);
//set request in flight
loadThresholds.setRequestsInFlight(requestsInFlight);
@@ -409,7 +409,7 @@ public class PojoConverter {
org.apache.stratos.autoscaler.stub.autoscale.policy.MemoryConsumptionThresholds();
//set memory consumption information
- memoryConsumption.setUpperLimit(autoscalePolicyBean.getLoadThresholds().memoryConsumption.upperLimit);
+ memoryConsumption.setUpperLimit(autoscalePolicyBean.getLoadThresholds().memoryConsumption.threshold);
memoryConsumption.setLowerLimit(autoscalePolicyBean.getLoadThresholds().memoryConsumption.lowerLimit);
//set memory consumption
loadThresholds.setMemoryConsumption(memoryConsumption);
@@ -741,19 +741,19 @@ public class PojoConverter {
LoadThresholds loadThresholdBean = new LoadThresholds();
if (loadThresholds.getLoadAverage() != null) {
LoadAverageThresholds loadAverage = new LoadAverageThresholds();
- loadAverage.upperLimit = loadThresholds.getLoadAverage().getUpperLimit();
+ loadAverage.threshold = loadThresholds.getLoadAverage().getUpperLimit();
loadAverage.lowerLimit = loadThresholds.getLoadAverage().getLowerLimit();
loadThresholdBean.loadAverage = loadAverage;
}
if (loadThresholds.getMemoryConsumption() != null) {
MemoryConsumptionThresholds memoryConsumption = new MemoryConsumptionThresholds();
- memoryConsumption.upperLimit = loadThresholds.getMemoryConsumption().getUpperLimit();
+ memoryConsumption.threshold = loadThresholds.getMemoryConsumption().getUpperLimit();
memoryConsumption.lowerLimit = loadThresholds.getMemoryConsumption().getLowerLimit();
loadThresholdBean.memoryConsumption = memoryConsumption;
}
if (loadThresholds.getRequestsInFlight() != null) {
RequestsInFlightThresholds requestsInFlight = new RequestsInFlightThresholds();
- requestsInFlight.upperLimit = loadThresholds.getRequestsInFlight().getUpperLimit();
+ requestsInFlight.threshold = loadThresholds.getRequestsInFlight().getUpperLimit();
requestsInFlight.lowerLimit = loadThresholds.getRequestsInFlight().getLowerLimit();
loadThresholdBean.requestsInFlight = requestsInFlight;
}
[2/2] stratos git commit: Adding cluster id to cluster level
partition context
Posted by la...@apache.org.
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;