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/01/18 15:43:19 UTC
[1/4] git commit: Get the sclaing rates from rules file itself
Updated Branches:
refs/heads/master 87f8d5d51 -> 1f5a3ad95
Get the sclaing rates from rules file itself
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b1c72b5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b1c72b5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b1c72b5a
Branch: refs/heads/master
Commit: b1c72b5a901d467dbc75c0c2723158d0987651ec
Parents: b48bfcd
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Jan 17 18:19:38 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Jan 17 18:19:38 2014 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/conf/scaling.drl | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b1c72b5a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
index 29b7c55..4955e0d 100644
--- a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
+++ b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
@@ -86,11 +86,8 @@ dialect "mvel"
laAverageLimit : Float() from $loadThresholds.getLoadAverage().getAverage()
laPredictedValue : Double() from $delegator.getPredictedValueForNextMinute(loadAverageAverage, loadAverageGradient, loadAverageSecondDerivative, 1)
- eval(log.debug("[scaling] " + " [cluster] " + clusterId + " Scale-up factor: " + $delegator.SCALE_UP_FACTOR))
- eval(log.debug("[scaling] " + " [cluster] " + clusterId + " Scale-down factor: " + $delegator.SCALE_DOWN_FACTOR))
-
- scaleUp : Boolean() from ((rifReset && (rifPredictedValue > rifAverageLimit * $delegator.SCALE_UP_FACTOR)) || (mcReset && (mcPredictedValue > mcAverageLimit * $delegator.SCALE_UP_FACTOR)) || (laReset && (laPredictedValue > laAverageLimit * $delegator.SCALE_UP_FACTOR)))
- scaleDown : Boolean() from ((rifReset && (rifPredictedValue < rifAverageLimit * $delegator.SCALE_DOWN_FACTOR)) || (mcReset && (mcPredictedValue < mcAverageLimit * $delegator.SCALE_DOWN_FACTOR)) || (laReset && (laPredictedValue < laAverageLimit * $delegator.SCALE_DOWN_FACTOR)))
+ scaleUp : Boolean() from ((rifReset && (rifPredictedValue > rifAverageLimit * 0.8)) || (mcReset && (mcPredictedValue > mcAverageLimit * 0.8)) || (laReset && (laPredictedValue > laAverageLimit * 0.8)))
+ scaleDown : Boolean() from ((rifReset && (rifPredictedValue < rifAverageLimit * 0.1)) || (mcReset && (mcPredictedValue < mcAverageLimit * 0.1)) || (laReset && (laPredictedValue < laAverageLimit * 0.1)))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF predicted value: " + rifPredictedValue))
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF average limit: " + rifAverageLimit))
@@ -116,7 +113,7 @@ dialect "mvel"
}
} else if(scaleDown){
- if($networkPartitionContext.getScaleDownRequestsCount() > $networkPartitionContext.getScaleDownWaitCount()){
+ if($networkPartitionContext.getScaleDownRequestsCount() > 5 ){
$networkPartitionContext.resetScaleDownRequestsCount();
MemberStatsContext selectedMemberStatsContext = null;
[4/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/1f5a3ad9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1f5a3ad9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1f5a3ad9
Branch: refs/heads/master
Commit: 1f5a3ad95255eb688f78a57447b030c80c329a82
Parents: beea495 87f8d5d
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Jan 18 20:17:42 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Jan 18 20:17:42 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/manager/dto/Cartridge.java | 15 +++-
.../manager/CartridgeSubscriptionManager.java | 5 +-
.../DatabaseBasedPersistenceManager.java | 6 +-
.../subscription/CartridgeSubscription.java | 10 +--
.../subscription/DataCartridgeSubscription.java | 28 ++++----
.../DataCartridgeSubscription_old.java | 8 +--
.../subscription/LBCartridgeSubscription.java | 9 +++
.../factory/CartridgeSubscriptionFactory.java | 8 ++-
.../rest/endpoint/services/ServiceUtils.java | 74 +++++++++-----------
.../rest/endpoint/services/StratosAdmin.java | 2 +-
10 files changed, 90 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/568ce201
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/568ce201
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/568ce201
Branch: refs/heads/master
Commit: 568ce201667cc4866b39f90bccfd94fceab080bd
Parents: b1c72b5 a050942
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Jan 17 18:19:47 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Jan 17 18:19:47 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cartridge.agent/pom.xml | 10 +-
.../stratos/cartridge/agent/CartridgeAgent.java | 8 +-
.../cartridge/agent/RepositoryFileListener.java | 2 +-
.../git/impl/GitBasedArtifactRepository.java | 181 ++++++++++++++++---
.../git/internal/RepositoryContext.java | 11 +-
.../impl/CloudControllerServiceImpl.java | 48 ++---
.../manager/CartridgeSubscriptionManager.java | 10 +-
.../distribution/src/main/extensions/clean.sh | 3 +-
8 files changed, 207 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/beea4951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/beea4951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/beea4951
Branch: refs/heads/master
Commit: beea4951eef5bb915670968a05359f6cbc3c64c3
Parents: 568ce20 9960fae
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Jan 17 20:57:29 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Jan 17 20:57:29 2014 +0530
----------------------------------------------------------------------
.../controllers/cartridgeSubscribeSubmit.jag | 32 ++++
.../console/subscribe_cartridge.jag | 12 +-
.../themes/theme1/partials/cartridges.hbs | 2 +-
.../theme1/partials/subscribe_cartridge.hbs | 165 ++++++++++---------
.../themes/theme1/renderers/cartridges.js | 2 -
.../theme1/renderers/subscribe_cartridge.js | 5 +-
.../console/util/utility.jag | 20 ++-
.../manager/CartridgeSubscriptionManager.java | 15 +-
8 files changed, 159 insertions(+), 94 deletions(-)
----------------------------------------------------------------------