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/12/13 20:19:23 UTC
stratos git commit: Adding instance id to monitor scaling event
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 88b419e8d -> 8bc9e91b2
Adding instance id to monitor scaling event
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8bc9e91b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8bc9e91b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8bc9e91b
Branch: refs/heads/4.1.0-test
Commit: 8bc9e91b233c1e3e11e21ca6ec1b2dde7f7197d2
Parents: 88b419e
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Dec 14 00:50:39 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Dec 14 00:50:39 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/monitor/cluster/VMClusterMonitor.java | 4 ++--
.../monitor/events/builder/MonitorStatusEventBuilder.java | 5 +++--
.../apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 7 ++++---
.../modules/distribution/src/main/conf/drools/scaling.drl | 4 ++--
4 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8bc9e91b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
index 50bc7b8..f21bac8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
@@ -442,9 +442,9 @@ public class VMClusterMonitor extends AbstractClusterMonitor {
}
- public void sendClusterScalingEvent(String networkPartitionId, float factor) {
+ public void sendClusterScalingEvent(String networkPartitionId, String instanceId, float factor) {
- MonitorStatusEventBuilder.handleClusterScalingEvent(this.parent, networkPartitionId, factor, this.id);
+ MonitorStatusEventBuilder.handleClusterScalingEvent(this.parent, networkPartitionId, instanceId, factor, this.id);
}
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/8bc9e91b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
index 7c6208f..9f9517c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
@@ -53,10 +53,11 @@ public class MonitorStatusEventBuilder {
}
public static void handleClusterScalingEvent(ParentComponentMonitor parent,
- String networkPartitionId, float factor, String appId) {
+ String networkPartitionId, String instanceId, float factor,
+ String appId) {
//Send notifications to parent of the cluster monitor
- MonitorScalingEvent monitorScalingEvent = new MonitorScalingEvent(appId, networkPartitionId, null,factor) ;
+ MonitorScalingEvent monitorScalingEvent = new MonitorScalingEvent(appId, networkPartitionId, instanceId,factor) ;
notifyParent(parent, monitorScalingEvent);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8bc9e91b/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 09dd518..34ff92b 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
@@ -307,17 +307,18 @@ public class RuleTasksDelegator {
}
- public void delegateScalingDependencyNotification(String clusterId, String networkPartitionId, float factor) {
+ public void delegateScalingDependencyNotification(String clusterId, String networkPartitionId, String instanceId,
+ float factor) {
if(log.isDebugEnabled()) {
- log.debug("In Delegate scaling dependent notification..");
+ log.debug("Scaling dependent notification..");
}
//Notify parent for checking scaling dependencies
AbstractClusterMonitor clusterMonitor = AutoscalerContext.getInstance().getClusterMonitor(clusterId);
if (clusterMonitor instanceof VMClusterMonitor) {
VMClusterMonitor vmClusterMonitor = (VMClusterMonitor) clusterMonitor;
- vmClusterMonitor.sendClusterScalingEvent(networkPartitionId, factor);
+ vmClusterMonitor.sendClusterScalingEvent(networkPartitionId, instanceId, factor);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/8bc9e91b/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 2a0a72b..a4d5026 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -126,7 +126,6 @@ dialect "mvel"
//Calculating the factor scaling
float factor = numberOfRequiredInstances / clusterInstanceContext.getMinInstanceCount();
- // delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getId(), factor);
boolean partitionsAvailable = true;
int count = 0;
@@ -139,7 +138,8 @@ dialect "mvel"
log.debug("[scale-up] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId );
log.debug("[scale-up] " + " has scaling dependents " + clusterInstanceContext.isHasScalingDependants() + " [cluster] " + clusterId );
if(clusterInstanceContext.isHasScalingDependants()) {
- delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), factor);
+
+ delegator.delegateScalingDependencyNotification(clusterId, clusterInstanceContext.getNetworkPartitionId(), clusterInstanceContext.getId(), factor);
} else {
delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), isPrimary);
}