You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2013/11/06 07:58:55 UTC
[1/3] git commit: Improve autoscaler policy deployer / reactor policy
models
Updated Branches:
refs/heads/master 50e45d8bd -> 11122cb8e
Improve autoscaler policy deployer / reactor policy models
Signed-off-by: Sajith Kariyawasam <sa...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a91ba0c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a91ba0c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a91ba0c4
Branch: refs/heads/master
Commit: a91ba0c48c2da08d037ed641dd1ae5c58f25137f
Parents: f015d82
Author: Melan Nimesh <me...@gmail.com>
Authored: Wed Nov 6 11:35:31 2013 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Wed Nov 6 11:44:47 2013 +0530
----------------------------------------------------------------------
.../policy/deployers/PolicyReader.java | 6 ++++
.../autoscaler/policy/model/LoadAverage.java | 32 ++++++++++++++++++++
.../policy/model/MemoryConsumption.java | 32 ++++++++++++++++++++
.../policy/model/RequestsInFlight.java | 32 ++++++++++++++++++++
4 files changed, 102 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a91ba0c4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/PolicyReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/PolicyReader.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/PolicyReader.java
index 0624e7b..42f77cd 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/PolicyReader.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/PolicyReader.java
@@ -93,6 +93,8 @@ public class PolicyReader {
reqInFlight.setAverage(Float.valueOf(readValueAttr(reqInFlightEle,"Average")));
reqInFlight.setGradient(Float.valueOf(readValueAttr(reqInFlightEle,"Gradient")));
reqInFlight.setSecondDerivative(Float.valueOf(readValueAttr(reqInFlightEle,"SecondDerivative")));
+ reqInFlight.setScaleDownMarginOfGradient(Float.valueOf(readValueAttr(reqInFlightEle,"ScaleDownMarginOfGradient")));
+ reqInFlight.setScaleDownMarginOfSecondDerivative(Float.valueOf(readValueAttr(reqInFlightEle,"ScaleDownMarginOfSecondDerivative")));
loadThresholds.setRequestsInFlight(reqInFlight);
//MemoryConsumption
@@ -101,6 +103,8 @@ public class PolicyReader {
memConsumption.setAverage(Float.valueOf(readValueAttr(memConsumptionEle,"Average")));
memConsumption.setGradient(Float.valueOf(readValueAttr(memConsumptionEle,"Gradient")));
memConsumption.setSecondDerivative(Float.valueOf(readValueAttr(memConsumptionEle,"SecondDerivative")));
+ memConsumption.setScaleDownMarginOfGradient(Float.valueOf(readValueAttr(memConsumptionEle,"ScaleDownMarginOfGradient")));
+ memConsumption.setScaleDownMarginOfSecondDerivative(Float.valueOf(readValueAttr(memConsumptionEle,"ScaleDownMarginOfSecondDerivative")));
loadThresholds.setMemoryConsumption(memConsumption);
//LoadAverage
@@ -109,6 +113,8 @@ public class PolicyReader {
loadAvr.setAverage(Float.valueOf(readValueAttr(loadAvrEle,"Average")));
loadAvr.setGradient(Float.valueOf(readValueAttr(loadAvrEle,"Gradient")));
loadAvr.setSecondDerivative(Float.valueOf(readValueAttr(loadAvrEle,"SecondDerivative")));
+ loadAvr.setScaleDownMarginOfGradient(Float.valueOf(readValueAttr(loadAvrEle,"ScaleDownMarginOfGradient")));
+ loadAvr.setScaleDownMarginOfSecondDerivative(Float.valueOf(readValueAttr(loadAvrEle,"ScaleDownMarginOfSecondDerivative")));
loadThresholds.setLoadAverage(loadAvr);
policy.setLoadThresholds(loadThresholds);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a91ba0c4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
index 3e54d81..a8147f2 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
@@ -27,6 +27,8 @@ public class LoadAverage {
private float average;
private float secondDerivative;
private float gradient;
+ private float scaleDownMarginOfGradient;
+ private float scaleDownMarginOfSecondDerivative;
/**
* Gets the value of the average property.
@@ -71,4 +73,34 @@ public class LoadAverage {
this.gradient = value;
}
+ /**
+ * Gets the value of the scaleDownSlowerMarginOfGradient property.
+ */
+ public float getScaleDownMarginOfGradient() {
+ return scaleDownMarginOfGradient;
+ }
+
+ /**
+ * Sets the value of the scaleDownSlowerMarginOfGradient property.
+ *
+ */
+ public void setScaleDownMarginOfGradient(float scaleDownMarginOfGradient) {
+ this.scaleDownMarginOfGradient = scaleDownMarginOfGradient;
+ }
+
+ /**
+ * Gets the value of the scaleDownSlowerMarginOfSecondDerivative property.
+ */
+ public float getScaleDownMarginOfSecondDerivative() {
+ return scaleDownMarginOfSecondDerivative;
+ }
+
+ /**
+ * Sets the value of the scaleDownSlowerMarginOfSecondDerivative property.
+ *
+ */
+ public void setScaleDownMarginOfSecondDerivative(float scaleDownMarginOfSecondDerivative) {
+ this.scaleDownMarginOfSecondDerivative = scaleDownMarginOfSecondDerivative;
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a91ba0c4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
index 39161b6..c9a720b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
@@ -27,6 +27,9 @@ public class MemoryConsumption {
private float average;
private float secondDerivative;
private float gradient;
+ private float scaleDownMarginOfGradient;
+ private float scaleDownMarginOfSecondDerivative;
+
/**
* Gets the value of the average property.
@@ -72,5 +75,34 @@ public class MemoryConsumption {
}
+ /**
+ * Gets the value of the scaleDownSlowerMarginOfGradient property.
+ */
+ public float getScaleDownMarginOfGradient() {
+ return scaleDownMarginOfGradient;
+ }
+
+ /**
+ * Sets the value of the scaleDownSlowerMarginOfGradient property.
+ *
+ */
+ public void setScaleDownMarginOfGradient(float scaleDownMarginOfGradient) {
+ this.scaleDownMarginOfGradient = scaleDownMarginOfGradient;
+ }
+
+ /**
+ * Gets the value of the scaleDownSlowerMarginOfSecondDerivative property.
+ */
+ public float getScaleDownMarginOfSecondDerivative() {
+ return scaleDownMarginOfSecondDerivative;
+ }
+
+ /**
+ * Sets the value of the scaleDownSlowerMarginOfSecondDerivative property.
+ *
+ */
+ public void setScaleDownMarginOfSecondDerivative(float scaleDownMarginOfSecondDerivative) {
+ this.scaleDownMarginOfSecondDerivative = scaleDownMarginOfSecondDerivative;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a91ba0c4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/RequestsInFlight.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/RequestsInFlight.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/RequestsInFlight.java
index bc6afbe..fc40016 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/RequestsInFlight.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/RequestsInFlight.java
@@ -27,6 +27,8 @@ public class RequestsInFlight {
private float average;
private float secondDerivative;
private float gradient;
+ private float scaleDownMarginOfGradient;
+ private float scaleDownMarginOfSecondDerivative;
/**
* Gets the value of the average property.
@@ -71,4 +73,34 @@ public class RequestsInFlight {
this.gradient = value;
}
+ /**
+ * Gets the value of the scaleDownSlowerMarginOfGradient property.
+ */
+ public float getScaleDownMarginOfGradient() {
+ return scaleDownMarginOfGradient;
+ }
+
+ /**
+ * Sets the value of the scaleDownSlowerMarginOfGradient property.
+ *
+ */
+ public void setScaleDownMarginOfGradient(float scaleDownMarginOfGradient) {
+ this.scaleDownMarginOfGradient = scaleDownMarginOfGradient;
+ }
+
+ /**
+ * Gets the value of the scaleDownSlowerMarginOfSecondDerivative property.
+ */
+ public float getScaleDownMarginOfSecondDerivative() {
+ return scaleDownMarginOfSecondDerivative;
+ }
+
+ /**
+ * Sets the value of the scaleDownSlowerMarginOfSecondDerivative property.
+ *
+ */
+ public void setScaleDownMarginOfSecondDerivative(float scaleDownMarginOfSecondDerivative) {
+ this.scaleDownMarginOfSecondDerivative = scaleDownMarginOfSecondDerivative;
+ }
+
}
\ No newline at end of file
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7987f97c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7987f97c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7987f97c
Branch: refs/heads/master
Commit: 7987f97c32a48574f94b9b44224f09c4cf07f627
Parents: a91ba0c 73d4a87
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Wed Nov 6 11:45:23 2013 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Wed Nov 6 11:45:23 2013 +0530
----------------------------------------------------------------------
.../org.apache.stratos.adc.topology.mgt/pom.xml | 6 -
.../adc/topology/mgt/util/ConfigHolder.java | 5 -
components/org.apache.stratos.lb.common/pom.xml | 122 --
.../stratos/lb/common/cache/LRUCache.java | 103 --
.../lb/common/cache/URLMappingCache.java | 47 -
.../common/conf/LoadBalancerConfiguration.java | 1202 ------------------
.../LoadBalancerConfigurationDSComponent.java | 47 -
.../stratos/lb/common/conf/structure/Node.java | 356 ------
.../lb/common/conf/structure/NodeBuilder.java | 140 --
.../stratos/lb/common/conf/util/Constants.java | 50 -
.../lb/common/conf/util/HostContext.java | 161 ---
.../conf/util/LoadBalancerConfigUtil.java | 305 -----
.../common/conf/util/TenantDomainContext.java | 80 --
.../mgt/SubDomainAwareGroupManagementAgent.java | 58 -
.../lb/common/mb/connect/TopicConnector.java | 103 --
.../common/mb/heartbeat/TopicHealthChecker.java | 81 --
.../lb/common/mb/publish/TopicPublisher.java | 109 --
.../lb/common/mb/subscribe/TopicSubscriber.java | 119 --
.../RequestTokenReplicationCommand.java | 73 --
.../LoadBalancerConfigurationService.java | 79 --
.../LoadBalancerConfigurationServiceImpl.java | 48 -
.../stratos/lb/common/util/DomainMapping.java | 45 -
.../org/apache/stratos/lb/common/util/Util.java | 54 -
.../src/main/resources/META-INF/services.xml | 31 -
.../common/test/LoadBalancerConfigUtilTest.java | 48 -
.../test/LoadBalancerConfigurationTest.java | 169 ---
.../stratos/lb/common/test/NodeBuilderTest.java | 123 --
.../src/test/resources/loadbalancer.conf | 84 --
.../src/test/resources/loadbalancer1.conf | 60 -
.../src/test/resources/loadbalancer2.conf | 50 -
.../src/test/resources/testng.xml | 36 -
.../org.apache.stratos.lb.endpoint/pom.xml | 135 --
.../stratos/lb/endpoint/ClusterContext.java | 63 -
.../stratos/lb/endpoint/EndpointDeployer.java | 79 --
.../lb/endpoint/LoadBalancerContext.java | 181 ---
.../stratos/lb/endpoint/RequestDelegator.java | 112 --
.../stratos/lb/endpoint/ServiceContext.java | 56 -
...TenantAwareLoadBalanceEndpointException.java | 39 -
.../lb/endpoint/algorithm/AlgorithmContext.java | 51 -
.../algorithm/LoadBalanceAlgorithm.java | 65 -
.../algorithm/LoadBalanceAlgorithmFactory.java | 69 -
.../lb/endpoint/algorithm/RoundRobin.java | 97 --
.../TenantAwareLoadBalanceEndpoint.java | 517 --------
.../LoadBalanceEndpointServiceComponent.java | 333 -----
.../endpoint/mediators/ResponseInterceptor.java | 58 -
.../stat/LoadBalancingStatsCollector.java | 110 --
.../stat/observers/WSO2CEPStatsObserver.java | 102 --
.../stratos/lb/endpoint/util/Constants.java | 27 -
.../pom.xml | 110 ++
.../LoadBalancerCommonServiceComponent.java | 41 +
.../statistics/LoadBalancingStatsCollector.java | 110 ++
.../observers/WSO2CEPStatsObserver.java | 102 ++
.../org.apache.stratos.load.balancer/pom.xml | 139 ++
.../stratos/load/balancer/ClusterContext.java | 63 +
.../stratos/load/balancer/EndpointDeployer.java | 79 ++
.../load/balancer/LoadBalancerContext.java | 181 +++
.../stratos/load/balancer/RequestDelegator.java | 112 ++
.../stratos/load/balancer/ServiceContext.java | 56 +
...TenantAwareLoadBalanceEndpointException.java | 39 +
.../balancer/algorithm/AlgorithmContext.java | 51 +
.../algorithm/LoadBalanceAlgorithm.java | 65 +
.../algorithm/LoadBalanceAlgorithmFactory.java | 69 +
.../load/balancer/algorithm/RoundRobin.java | 97 ++
.../TenantAwareLoadBalanceEndpoint.java | 517 ++++++++
.../internal/LoadBalancerServiceComponent.java | 333 +++++
.../balancer/mediators/ResponseInterceptor.java | 56 +
.../stratos/load/balancer/util/Constants.java | 27 +
.../stratos/messaging/event/EventListener.java | 50 +
.../messaging/event/EventObservable.java | 41 +
.../synchronization/ArtifactUpdatedEvent.java | 44 +
.../event/depsync/ArtifactsUpdatedEvent.java | 44 -
.../message/processor/MessageProcessor.java | 44 +
.../processor/MessageProcessorChain.java | 60 +
.../topology/ClusterCreatedEventProcessor.java | 20 +-
.../topology/ClusterRemovedEventProcessor.java | 19 +-
.../CompleteTopologyEventProcessor.java | 20 +-
.../topology/InstanceSpawnedEventProcessor.java | 19 +-
.../topology/MemberActivatedEventProcessor.java | 19 +-
.../topology/MemberStartedEventProcessor.java | 122 +-
.../topology/MemberSuspendedEventProcessor.java | 18 +-
.../MemberTerminatedEventProcessor.java | 120 +-
.../topology/ServiceCreatedEventProcessor.java | 18 +-
.../topology/ServiceRemovedEventProcessor.java | 20 +-
.../topology/TopologyEventProcessorChain.java | 47 +
.../topology/TopologyMessageProcessor.java | 43 -
.../topology/TopologyEventMessageDelegator.java | 57 +-
.../stratos/messaging/util/Constants.java | 1 +
.../org/apache/stratos/messaging/util/Util.java | 5 +-
components/pom.xml | 4 +-
.../pom.xml | 86 --
.../pom.xml | 91 --
.../pom.xml | 86 ++
.../pom.xml | 91 ++
features/load-balancer/pom.xml | 6 +-
.../cloud-controller/modules/p2-profile/pom.xml | 8 -
.../distribution/src/main/conf/log4j.properties | 2 +-
.../synapse-configs/default/sequences/main.xml | 6 +-
.../distribution/src/main/license/LICENSE | 2 +-
.../load-balancer/modules/p2-profile/pom.xml | 4 +-
99 files changed, 2968 insertions(+), 6584 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/11122cb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/11122cb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/11122cb8
Branch: refs/heads/master
Commit: 11122cb8e69e15733f8cd53348c0f0bf83cfd005
Parents: 7987f97 50e45d8
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Wed Nov 6 12:28:25 2013 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Wed Nov 6 12:28:25 2013 +0530
----------------------------------------------------------------------
.../InstanceStatisticsEventBuilder.xml | 22 ++
.../LoadBalancerStatisticsEventBuilder.xml | 10 +
.../stratos.instance.stats_1.0.0_builder.xml | 10 +
.../AverageRequestsInflightEventFormatter.xml | 11 +
.../eventformatters/GradientEventFormatter.xml | 11 +
.../SecondDerivativeEventFormatter.xml | 11 +
.../AverageRequestsInflightFinder.xml | 19 ++
.../GradientOfRequestsInFlightFinder.xml | 18 ++
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 ++
.../DefaultWSO2EventInputAdaptor.xml | 3 +
.../InstanceStatsInputAdaptor.xml | 9 +
.../DefaultWSO2EventOutputAdaptor.xml | 8 +
.../outputeventadaptors/JMSOutputAdaptor.xml | 8 +
extensions/cep/stratos-cep-extension/pom.xml | 57 ++++
.../GradientFinderWindowProcessor.java | 268 +++++++++++++++++
.../SecondDerivativeFinderWindowProcessor.java | 286 +++++++++++++++++++
.../InstanceStatisticsEventBuilder.xml | 22 --
.../LoadBalancerStatisticsEventBuilder.xml | 10 -
.../stratos.instance.stats_1.0.0_builder.xml | 10 -
.../AverageRequestsInflightEventFormatter.xml | 11 -
.../eventformatters/GradientEventFormatter.xml | 11 -
.../SecondDerivativeEventFormatter.xml | 11 -
.../AverageRequestsInflightFinder.xml | 19 --
.../GradientOfRequestsInFlightFinder.xml | 18 --
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 --
.../DefaultWSO2EventInputAdaptor.xml | 3 -
.../InstanceStatsInputAdaptor.xml | 9 -
.../DefaultWSO2EventOutputAdaptor.xml | 8 -
.../outputeventadaptors/JMSOutputAdaptor.xml | 8 -
.../stratos-cep-extensions/pom.xml | 57 ----
.../GradientFinderWindowProcessor.java | 268 -----------------
.../SecondDerivativeFinderWindowProcessor.java | 286 -------------------
32 files changed, 770 insertions(+), 770 deletions(-)
----------------------------------------------------------------------