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/11/13 15:17:14 UTC

stratos git commit: fixing faulty member handling issue for the dependent cluster

Repository: stratos
Updated Branches:
  refs/heads/master 4d76f0e01 -> f1a4679f7


fixing faulty member handling issue for the dependent cluster


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

Branch: refs/heads/master
Commit: f1a4679f7c0dbaeb65a31ea946d7fb0827786f9c
Parents: 4d76f0e
Author: reka <rt...@gmail.com>
Authored: Thu Nov 13 19:34:39 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Nov 13 19:34:39 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/applications/dependency/DependencyTree.java     | 6 +++---
 .../stratos/autoscaler/monitor/ParentComponentMonitor.java     | 2 --
 .../autoscaler/monitor/application/ApplicationMonitor.java     | 1 +
 .../apache/stratos/autoscaler/monitor/group/GroupMonitor.java  | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/f1a4679f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
index c1d0817..445cb74 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
@@ -186,15 +186,15 @@ public class DependencyTree {
     public List<ApplicationContext> getTerminationDependencies(String id) {
         List<ApplicationContext> allChildrenOfAppContext = new ArrayList<ApplicationContext>();
         ApplicationContext applicationContext = findApplicationContextWithId(id);
-
+        //adding the terminated one to the list
+        allChildrenOfAppContext.add(applicationContext);
         if (terminationBehavior == TerminationBehavior.TERMINATE_DEPENDENT) {
             //finding the ApplicationContext of the given id
             //finding all the children of the found application context
-            allChildrenOfAppContext.add(applicationContext);
             findAllChildrenOfAppContext(applicationContext.getApplicationContextList(),
                     allChildrenOfAppContext);
             return allChildrenOfAppContext;
-        } else if (terminationBehavior == TerminationBehavior.TERMINATE_DEPENDENT) {
+        } else if (terminationBehavior == TerminationBehavior.TERMINATE_ALL) {
             //killall will be killed by the monitor from it's list.
             findAllChildrenOfAppContext(this.applicationContextList,
                     allChildrenOfAppContext);

http://git-wip-us.apache.org/repos/asf/stratos/blob/f1a4679f/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 eddf470..4646ce3 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
@@ -209,8 +209,6 @@ public abstract class ParentComponentMonitor extends Monitor {
             //Find the non existent monitor by traversing dependency tree
             try {
                 this.startDependencyOnTermination();
-                List<ApplicationContext> applicationContexts = this.startupDependencyTree.
-                        getStarAbleDependenciesByTermination();
             } catch (TopologyInConsistentException e) {
                 //TODO revert the siblings and notify parent, change a flag for reverting/un-subscription
                 log.error("Error while starting the monitor upon termination" + e);

http://git-wip-us.apache.org/repos/asf/stratos/blob/f1a4679f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
index 8d8c28c..6d76305 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
@@ -166,6 +166,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
         } else if (status1 == ClusterStatus.Created || status1 == GroupStatus.Created) {
             if (this.inactiveMonitorsList.contains(id)) {
                 this.inactiveMonitorsList.remove(id);
+                this.aliasToActiveMonitorsMap.remove(id);
             }
             if (this.status == ApplicationStatus.Terminating) {
                 StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId);

http://git-wip-us.apache.org/repos/asf/stratos/blob/f1a4679f/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 5d8dfeb..a49c76e 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
@@ -75,6 +75,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler
         } else if (status1 == ClusterStatus.Created || status1 == GroupStatus.Created) {
             if (this.inactiveMonitorsList.contains(id)) {
                 this.inactiveMonitorsList.remove(id);
+                this.aliasToActiveMonitorsMap.remove(id);
             }
             if (this.status == GroupStatus.Terminating) {
                 StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId);