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/30 14:34:15 UTC

git commit: fixing appId issue and calculating status issue

Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping d41da06c6 -> fe4ccedd3


fixing appId issue and calculating status issue


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fe4ccedd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fe4ccedd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fe4ccedd

Branch: refs/heads/4.0.0-grouping
Commit: fe4ccedd3c31bd0c4ca3153dee0affad1880360f
Parents: d41da06
Author: reka <rt...@gmail.com>
Authored: Thu Oct 30 19:02:30 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Oct 30 19:04:08 2014 +0530

----------------------------------------------------------------------
 .../stratos/autoscaler/monitor/AbstractClusterMonitor.java     | 1 -
 .../stratos/autoscaler/status/checker/StatusChecker.java       | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/fe4ccedd/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 881f838..8ec65c7 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
@@ -63,7 +63,6 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable
 
     protected String clusterId;
     protected String serviceId;
-    protected String appId;
 
     protected boolean hasFaultyMember = false;
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/fe4ccedd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
index 348537e..a23e5bd 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
@@ -381,6 +381,9 @@ public class StatusChecker {
                 groupCreated = false;
             } else if (group.getStatus() == GroupStatus.Inactive) {
                 status = GroupStatus.Inactive;
+                groupActive = false;
+                groupTerminated = false;
+                groupCreated = false;
                 break;
             } else if (group.getStatus() == GroupStatus.Terminated) {
                 groupActive = false;
@@ -424,6 +427,9 @@ public class StatusChecker {
                 clusterCreated = false;
             } else if (cluster.getStatus() == ClusterStatus.Inactive) {
                 status = ClusterStatus.Inactive;
+                clusterActive = false;
+                clusterTerminated = false;
+                clusterCreated = false;
                 break;
             } else if (cluster.getStatus() == ClusterStatus.Terminated) {
                 clusterActive = false;