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 10:35:42 UTC
git commit: fixing monitor startup issue
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping 731e22ed0 -> 4eb3e860c
fixing monitor startup issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4eb3e860
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4eb3e860
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4eb3e860
Branch: refs/heads/4.0.0-grouping
Commit: 4eb3e860cfb4b6748bacefd234e87b35a9ebfb4e
Parents: 731e22e
Author: reka <rt...@gmail.com>
Authored: Wed Oct 22 14:04:06 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Wed Oct 22 14:05:22 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java | 1 +
.../apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java | 2 +-
.../org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4eb3e860/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 ccca072..d2b206f 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
@@ -77,6 +77,7 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable
public AbstractClusterMonitor() {
readConfigurations();
+ status = ClusterStatus.Created;
}
private void readConfigurations() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/4eb3e860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index 65e6882..114d8aa 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -65,7 +65,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
log.debug("ClusterMonitor:autoScalePolicy:" + autoscalePolicy);
}
networkPartitionCtxts = new ConcurrentHashMap<String, NetworkPartitionContext>();
- status = ClusterStatus.Created;
+ //status = ClusterStatus.Created;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4eb3e860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
index 14c53cd..161d9b4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
@@ -54,7 +54,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler
TopologyInConsistentException {
super(group);
this.appId = appId;
- this.setStatus(group.getStatus());
+ this.status = group.getStatus();
startDependency();
}