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/14 21:46:52 UTC
[4/4] stratos git commit: get the cluster/group monitor correctly at
Application monitor
get the cluster/group monitor correctly at Application monitor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0c638f48
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0c638f48
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0c638f48
Branch: refs/heads/4.1.0-test
Commit: 0c638f48ce52fa89092b0d489a53da825032a7a8
Parents: ae6488b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Dec 15 02:18:51 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Dec 15 02:18:51 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/component/ApplicationMonitor.java | 11 +++++++++--
.../events/builder/MonitorStatusEventBuilder.java | 5 +++--
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c638f48/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
index 7f49ea1..193573a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
@@ -195,11 +195,18 @@ public class ApplicationMonitor extends ParentComponentMonitor {
for(String scalingDependentListComponent : scalingDependentList.getScalingDependentListComponents()){
- if(scalingDependentListComponent.equals(scalingEvent.getId())){
+ if(scalingDependentListComponent.equals("cartridge."
+ + scalingEvent.getId().substring(0, scalingEvent.getId().indexOf('.')))
+ || scalingDependentListComponent.equals("group."
+ + scalingEvent.getId().substring(0, scalingEvent.getId().indexOf('.')))){
for(String scalingDependentListComponentInSelectedList : scalingDependentList.getScalingDependentListComponents()){
- Monitor monitor = aliasToActiveMonitorsMap.get(scalingDependentListComponentInSelectedList);
+ Monitor monitor = aliasToActiveMonitorsMap.get(
+ scalingDependentListComponentInSelectedList.substring(
+ scalingDependentListComponentInSelectedList.indexOf('.') + 1) +
+ "." + scalingEvent.getServiceName() +
+ ".domain");
if(monitor instanceof GroupMonitor || monitor instanceof VMClusterMonitor){
monitor.onParentScalingEvent(scalingEvent);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0c638f48/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 9f9517c..9fd2fdc 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
@@ -54,10 +54,11 @@ public class MonitorStatusEventBuilder {
public static void handleClusterScalingEvent(ParentComponentMonitor parent,
String networkPartitionId, String instanceId, float factor,
- String appId) {
+ String appId, String serviceName) {
//Send notifications to parent of the cluster monitor
- MonitorScalingEvent monitorScalingEvent = new MonitorScalingEvent(appId, networkPartitionId, instanceId,factor) ;
+ MonitorScalingEvent monitorScalingEvent = new MonitorScalingEvent(appId, networkPartitionId, instanceId, factor,
+ serviceName) ;
notifyParent(parent, monitorScalingEvent);
}