Updated Branches: refs/heads/master 9076bbfef -> 97926da70
swapping auto-scalare and deployement policies issue - STRATOS-212 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/97926da7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/97926da7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/97926da7 Branch: refs/heads/master Commit: 97926da70c1f0eb0bc09dc37bae49c832dcbd61f Parents: 9076bbf Author: Udara Liyanage <[email protected]> Authored: Wed Nov 20 17:15:19 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Nov 20 17:15:19 2013 -0500 ---------------------------------------------------------------------- .../main/autoscale-policies/economyPolicy.xml | 60 ++++++++------------ .../deployment-policies/economy-deployment.xml | 59 +++++++++++-------- 2 files changed, 59 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/97926da7/products/autoscaler/modules/distribution/src/main/autoscale-policies/economyPolicy.xml ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/autoscale-policies/economyPolicy.xml b/products/autoscaler/modules/distribution/src/main/autoscale-policies/economyPolicy.xml index 1a3aad3..9a734fa 100644 --- a/products/autoscaler/modules/distribution/src/main/autoscale-policies/economyPolicy.xml +++ b/products/autoscaler/modules/distribution/src/main/autoscale-policies/economyPolicy.xml @@ -1,36 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> -<deploymentPolicy id ="economy-deployment"> - <partitionGroups> - <partitionGroup id="group1" > - <partitionAlgo>OneAfterAnother</partitionAlgo> - <partition id="partition1" > - <max>3</max> - <min>1</min> - </partition> - <partition id="partition2" > - <max>5</max> - <min>1</min> - </partition> - <partition id="partition3"> - <max>20</max> - <min>1</min> - </partition> - </partitionGroup> - <partitionGroup id="group2" > - <partitionAlgo>RoundRobin</partitionAlgo> - <partition id="partition4" > - <max>3</max> - <min>1</min> - </partition> - <partition id="partition5" > - <max>5</max> - <min>1</min> - </partition> - <partition id="partition6"> - <max>20</max> - <min>1</min> - </partition> - </partitionGroup> - </partitionGroups> -</deploymentPolicy> - +<autoscalePolicy id="economyPolicy"> + <loadThresholds> + <requestsInFlight> + <average value="6000" /> + <gradient value="0" /> + <secondDerivative value="0" /> + <scaleDownMarginOfGradient value="1.0" /> + <scaleDownMarginOfSecondDerivative value="0.2" /> + </requestsInFlight> + <memoryConsumption> + <average value="6000" /> + <gradient value="0" /> + <secondDerivative value="0" /> + <scaleDownMarginOfGradient value="1.0" /> + <scaleDownMarginOfSecondDerivative value="0.2" /> + </memoryConsumption> + <loadAverage> + <average value="6000" /> + <gradient value="0" /> + <secondDerivative value="0" /> + <scaleDownMarginOfGradient value="1.0" /> + <scaleDownMarginOfSecondDerivative value="0.2" /> + </loadAverage> + </loadThresholds> +</autoscalePolicy> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/97926da7/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml ---------------------------------------------------------------------- diff --git a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml index 9a734fa..74c9dfa 100644 --- a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml +++ b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml @@ -1,26 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> -<autoscalePolicy id="economyPolicy"> - <loadThresholds> - <requestsInFlight> - <average value="6000" /> - <gradient value="0" /> - <secondDerivative value="0" /> - <scaleDownMarginOfGradient value="1.0" /> - <scaleDownMarginOfSecondDerivative value="0.2" /> - </requestsInFlight> - <memoryConsumption> - <average value="6000" /> - <gradient value="0" /> - <secondDerivative value="0" /> - <scaleDownMarginOfGradient value="1.0" /> - <scaleDownMarginOfSecondDerivative value="0.2" /> - </memoryConsumption> - <loadAverage> - <average value="6000" /> - <gradient value="0" /> - <secondDerivative value="0" /> - <scaleDownMarginOfGradient value="1.0" /> - <scaleDownMarginOfSecondDerivative value="0.2" /> - </loadAverage> - </loadThresholds> -</autoscalePolicy> +<deploymentPolicy id ="economy-deployment"> + <partitionGroups> + <partitionGroup id="group1" > + <partitionAlgo>OneAfterAnother</partitionAlgo> + <partition id="partition1" > + <max>3</max> + <min>1</min> + </partition> + <partition id="partition2" > + <max>5</max> + <min>1</min> + </partition> + <partition id="partition3"> + <max>20</max> + <min>1</min> + </partition> + </partitionGroup> + <partitionGroup id="group2" > + <partitionAlgo>RoundRobin</partitionAlgo> + <partition id="partition4" > + <max>3</max> + <min>1</min> + </partition> + <partition id="partition5" > + <max>5</max> + <min>1</min> + </partition> + <partition id="partition6"> + <max>20</max> + <min>1</min> + </partition> + </partitionGroup> + </partitionGroups> +</deploymentPolicy>
