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/19 18:46:25 UTC
[1/4] git commit: Fix scaling drools file
Updated Branches:
refs/heads/master 8b7ca5c57 -> 3e2829207
Fix scaling drools file
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/df066a0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/df066a0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/df066a0c
Branch: refs/heads/master
Commit: df066a0c9c631b48f599f3d4aa6fe86b52e7ebbd
Parents: 3ce7f9f
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Jan 19 10:14:44 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Jan 19 10:14:44 2014 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/conf/scaling.drl | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/df066a0c/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 d6c3a78..ddb184e 100644
--- a/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
+++ b/products/autoscaler/modules/distribution/src/main/conf/scaling.drl
@@ -113,8 +113,9 @@ dialect "mvel"
}
} else if(scaleDown){
+ log.debug("[scale-down] Decided to Scale down [cluster] " + clusterId);
if($networkPartitionContext.getScaleDownRequestsCount() > 5 ){
- log.debug("[scale-down] Reached scale down requests threshold [cluster] " + clusterId);
+ log.debug("[scale-down] Reached scale down requests threshold [cluster] " + clusterId + " Count " + $networkPartitionContext.getScaleDownRequestsCount());
$networkPartitionContext.resetScaleDownRequestsCount();
MemberStatsContext selectedMemberStatsContext = null;
double lowestOverallLoad = 0.0;
@@ -163,11 +164,12 @@ dialect "mvel"
$delegator.delegateTerminate(partitionContext, selectedMemberStatsContext.getMemberId());
}
- } else{
- $networkPartitionContext.increaseScaleDownRequestsCount();
- log.debug("[scale-down] Not reached scale down requests threshold. " + " [cluster] " + clusterId);
}
- }
+ } else{
+ log.debug("[scale-down] Not reached scale down requests threshold. " + clusterId + " Count " + $networkPartitionContext.getScaleDownRequestsCount());
+ $networkPartitionContext.increaseScaleDownRequestsCount();
+
+ }
} else{
log.debug("[scaling] No decision made to either scale up or scale down ... ");
[3/4] git commit: Delay normal cluster monitor min check until lb
cluster get added (if there is)
Posted by la...@apache.org.
Delay normal cluster monitor min check until lb cluster get added (if there is)
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e0b6e47a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e0b6e47a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e0b6e47a
Branch: refs/heads/master
Commit: e0b6e47aab8c89f9efa4039d9d29a51a7af83c3f
Parents: 8c7623a
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Jan 19 23:16:10 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Jan 19 23:16:10 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/algorithm/OneAfterAnother.java | 2 +-
.../org/apache/stratos/autoscaler/monitor/ClusterMonitor.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e0b6e47a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
index 75404c0..5c094d4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithm/OneAfterAnother.java
@@ -48,7 +48,7 @@ public class OneAfterAnother implements AutoscaleAlgorithm {
try {
if (log.isDebugEnabled())
- log.debug(String.format("Searching for a partition to up down [network partition] %s",
+ log.debug(String.format("Searching for a partition to up [network partition] %s",
networkPartitionContext.getId())) ;
int currentPartitionIndex = networkPartitionContext.getCurrentPartitionIndex();
List<?> partitions = Arrays.asList(networkPartitionContext.getPartitions());
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e0b6e47a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
index e76233b..6c44e4e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ClusterMonitor.java
@@ -58,6 +58,12 @@ public class ClusterMonitor extends AbstractMonitor{
@Override
public void run() {
+ try {
+ // TODO make this configurable,
+ // this is the delay the min check of normal cluster monitor to wait until LB monitor is added
+ Thread.sleep(60000);
+ } catch (InterruptedException ignore) {
+ }
while (!isDestroyed()) {
if (log.isDebugEnabled()) {
log.debug("Cluster monitor is running.. "+this.toString());
[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/3e282920
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3e282920
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3e282920
Branch: refs/heads/master
Commit: 3e282920791c3c54a1ee8dfe0ad1c5626b3a9ef7
Parents: e0b6e47 8b7ca5c
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Jan 19 23:20:52 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Jan 19 23:20:52 2014 +0530
----------------------------------------------------------------------
.../console/asset.jag | 5 ++
.../console/config/acl.json | 4 +-
.../console/controllers/addTenantSubmit.jag | 9 ---
.../console/controllers/newTenantSubmit.jag | 28 ++++++++
.../console/index.jag | 2 +
.../console/permission-mapping.txt | 19 ++++++
.../console/tenant_management.jag | 7 +-
.../console/themes/theme1/pages/plain.hbs | 67 ++++++++++++++++++++
.../console/themes/theme1/partials/404.hbs | 31 +++++++++
.../console/themes/theme1/partials/header.hbs | 7 +-
.../themes/theme1/partials/mycartridges.hbs | 2 +-
.../theme1/partials/policy_deployments.hbs | 15 ++++-
.../theme1/partials/subscribe_cartridge.hbs | 4 +-
.../themes/theme1/partials/tenant_new.hbs | 24 +++----
.../console/themes/theme1/renderers/asset.js | 38 +++++++++++
.../console/themes/theme1/renderers/index.js | 6 +-
.../theme1/renderers/subscribe_cartridge.js | 4 +-
.../console/util/utility.jag | 8 +++
18 files changed, 241 insertions(+), 39 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/8c7623ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8c7623ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8c7623ac
Branch: refs/heads/master
Commit: 8c7623ac82569fc1d05f51a76dd7f2639324fa19
Parents: df066a0 8997301
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Jan 19 10:14:58 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Jan 19 10:14:58 2014 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 2 +
.../synchronizer/RepositoryInformation.java | 7 +++
.../git/impl/GitBasedArtifactRepository.java | 45 ++++++++++++--------
.../config/CartridgeAgentConfiguration.java | 14 +++++-
.../agent/util/CartridgeAgentConstants.java | 1 +
5 files changed, 50 insertions(+), 19 deletions(-)
----------------------------------------------------------------------