You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/10/22 13:17:33 UTC
git commit: fixing issue while creating hierarchical monitors
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping d390ab597 -> 76a91ea21
fixing issue while creating hierarchical monitors
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/76a91ea2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/76a91ea2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/76a91ea2
Branch: refs/heads/4.0.0-grouping
Commit: 76a91ea2100672333e97ddb273e3375b110d7708
Parents: d390ab5
Author: reka <rt...@gmail.com>
Authored: Wed Oct 22 16:47:18 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Wed Oct 22 16:47:18 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/AbstractClusterMonitor.java | 13 ++-----------
.../autoscaler/monitor/ApplicationMonitorFactory.java | 1 -
.../org/apache/stratos/autoscaler/monitor/Monitor.java | 1 +
.../autoscaler/monitor/ParentComponentMonitor.java | 1 +
4 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/76a91ea2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java
index d2b206f..8ff4cac 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java
@@ -68,7 +68,7 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable
protected ClusterStatus status;
- protected ParentComponentMonitor parent;
+ //protected ParentComponentMonitor parent;
protected AutoscalerRuleEvaluator autoscalerRuleEvaluator;
@@ -252,21 +252,12 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable
* If the cluster in_active and if it is a in_dependent cluster,
* then won't send the notification to parent.
*/
- if(status == ClusterStatus.Inactive && !this.hasDependent) {
+ if(!(status == ClusterStatus.Inactive && !this.hasDependent)) {
MonitorStatusEventBuilder.handleClusterStatusEvent(this.parent, this.status, this.clusterId);
}
}
- public ParentComponentMonitor getParent() {
- return parent;
- }
-
- public void setParent(ParentComponentMonitor parent) {
- this.parent = parent;
- this.appId = parent.getAppId();
- }
-
@Override
public void onEvent(MonitorStatusEvent statusEvent) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/76a91ea2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
index fc22388..92b3eb8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ApplicationMonitorFactory.java
@@ -236,7 +236,6 @@ public class ApplicationMonitorFactory {
clusterMonitor = new ClusterMonitor(cluster.getClusterId(), cluster.getServiceName(),
deploymentPolicy, policy);
- clusterMonitor.setAppId(cluster.getAppId());
for (PartitionGroup partitionGroup : deploymentPolicy.getPartitionGroups()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/76a91ea2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
index b670077..1ac0893 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
@@ -70,6 +70,7 @@ public abstract class Monitor implements EventHandler {
public void setParent(ParentComponentMonitor parent) {
this.parent = parent;
+ this.appId = parent.getAppId();
}
public boolean hasMonitors() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/76a91ea2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java
index 7e74809..f2965fa 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java
@@ -52,6 +52,7 @@ public abstract class ParentComponentMonitor extends Monitor {
public ParentComponentMonitor(ParentComponent component) throws DependencyBuilderException {
aliasToActiveMonitorsMap = new HashMap<String, Monitor>();
+ aliasToInActiveMonitorsMap = new HashMap<String, Monitor>();
//clusterIdToClusterMonitorsMap = new HashMap<String, AbstractClusterMonitor>();
this.id = component.getUniqueIdentifier();
//Building the dependency for this monitor within the immediate children