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/11/18 10:19:32 UTC
[1/2] stratos git commit: Adding networkpartition id to scaling
dependents event
Repository: stratos
Updated Branches:
refs/heads/master b05a211f8 -> 8fb5f314c
Adding networkpartition id to scaling dependents event
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7d2485a1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7d2485a1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7d2485a1
Branch: refs/heads/master
Commit: 7d2485a1e41472d4fd791403ed2a886fa933ad35
Parents: b4e4569
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Nov 18 14:38:52 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Nov 18 14:38:52 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/monitor/MonitorStatusEventBuilder.java | 2 +-
.../autoscaler/monitor/cluster/VMServiceClusterMonitor.java | 4 ++--
.../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 5 ++---
.../modules/distribution/src/main/conf/drools/scaling.drl | 4 ++--
4 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d2485a1/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
index 5d1f87a..81c8616 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
@@ -46,7 +46,7 @@ public class MonitorStatusEventBuilder {
notifyParent(parent, applicationStatusEvent);
}
- public static void handleClusterScalingEvent(ParentComponentMonitor parent, float factor, String appId) {
+ public static void handleClusterScalingEvent(ParentComponentMonitor parent, String networkPartitionId, float factor, String appId) {
//Send notifications to parent of the cluster monitor
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d2485a1/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
index 2a04813..a6b34e8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
@@ -275,8 +275,8 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
}
}
- public void sendClusterScalingEvent(float factor) {
+ public void sendClusterScalingEvent(String networkPartitionId, float factor) {
- MonitorStatusEventBuilder.handleClusterScalingEvent(this.parent, factor, this.id);
+ MonitorStatusEventBuilder.handleClusterScalingEvent(this.parent, networkPartitionId, factor, this.id);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d2485a1/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
index f60417f..2f3e4c5 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
@@ -192,15 +192,14 @@ public class RuleTasksDelegator {
}
- public void delegateScalingDependencyNotification(String clusterId, float factor) {
-
+ public void delegateScalingDependencyNotification(String clusterId, String networkPartitionId, float factor) {
//Notify parent for checking scaling dependencies
AbstractClusterMonitor clusterMonitor = AutoscalerContext.getInstance().getClusterMonitor(clusterId);
if(clusterMonitor instanceof VMServiceClusterMonitor) {
VMServiceClusterMonitor vmServiceClusterMonitor = (VMServiceClusterMonitor) clusterMonitor;
- vmServiceClusterMonitor.sendClusterScalingEvent(factor);
+ vmServiceClusterMonitor.sendClusterScalingEvent(networkPartitionId, factor);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d2485a1/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
index 0b1f112..103ef0c 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -131,7 +131,7 @@ dialect "mvel"
//Calculating the factor scaling
float factor = numberOfRequiredInstances / $networkPartitionContext.getMinInstanceCount();
- $delegator.delegateScalingDependencyNotification(clusterId, factor);
+ $delegator.delegateScalingDependencyNotification(clusterId, $networkPartitionContext.getId(), factor);
while(count != additionalInstances){
Partition partition = autoscaleAlgorithm.getNextScaleUpPartition($networkPartitionContext, clusterId);
@@ -145,7 +145,7 @@ dialect "mvel"
} else if(scaleDown){
float factor = numberOfRequiredInstances / $networkPartitionContext.getMinInstanceCount();
- $delegator.delegateScalingDependencyNotification(clusterId, factor);
+ $delegator.delegateScalingDependencyNotification(clusterId, $networkPartitionContext.getId(), factor);
log.debug("[scale-down] Decided to Scale down [cluster] " + clusterId);
if($networkPartitionContext.getScaleDownRequestsCount() > 5 ){
[2/2] stratos git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8fb5f314
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8fb5f314
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8fb5f314
Branch: refs/heads/master
Commit: 8fb5f314cee2d6de96f1f2728d495eec948f9fa2
Parents: 7d2485a b05a211
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Nov 18 14:50:27 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Nov 18 14:50:27 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/PartitionContext.java | 2 +-
.../monitor/application/ApplicationMonitor.java | 18 +++++-------------
.../autoscaler/monitor/group/GroupMonitor.java | 10 ++--------
3 files changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------