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/09/26 09:33:33 UTC

git commit: fixing class cast exception

Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping 66e3bd3df -> 4432a31c4


fixing class cast exception


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

Branch: refs/heads/4.0.0-grouping
Commit: 4432a31c4ac292c0bf1f125d5ad7cc71360d7985
Parents: 66e3bd3
Author: reka <rt...@gmail.com>
Authored: Fri Sep 26 13:02:43 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Sep 26 13:02:43 2014 +0530

----------------------------------------------------------------------
 .../topology/AutoscalerTopologyEventReceiver.java    | 15 ++++++++++-----
 .../apache/stratos/autoscaler/monitor/Monitor.java   |  8 ++++----
 .../monitor/application/ApplicationMonitor.java      | 12 ++++++++++++
 3 files changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/4432a31c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
index 2cb28b1..fd84833 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -193,17 +193,22 @@ public class AutoscalerTopologyEventReceiver implements Runnable {
             @Override
             protected void onEvent(Event event) {
 
-                log.info("[ApplicationCreatedEventListener] Received: " + event.getClass());
+                log.info("[ApplicationRemovedEvent] Received: " + event.getClass());
 
-                ApplicationRemovedEvent applicationCreatedEvent = (ApplicationRemovedEvent) event;
+                ApplicationRemovedEvent applicationRemovedEvent = (ApplicationRemovedEvent) event;
 
                 //acquire read lock
                 TopologyManager.acquireReadLock();
 
                 try {
-                    //TODO build dependency and organize the application
-
-                    //remove monitors by checking the termination
+                    //TODO remove monitors as well as any starting or pending threads
+                    ApplicationMonitor monitor = AutoscalerContext.getInstance().
+                            getAppMonitor(applicationRemovedEvent.getApplicationId());
+                    List<String> clusters = monitor.findClustersOfApplication(applicationRemovedEvent.getApplicationId());
+                    for(String clusterId: clusters) {
+                        AutoscalerContext.getInstance().getMonitor(clusterId).setDestroyed(true);
+                        AutoscalerContext.getInstance().removeMonitor(clusterId);
+                    }
 
                 } finally {
                     //release read lock

http://git-wip-us.apache.org/repos/asf/stratos/blob/4432a31c/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 8c2ccb6..215c222 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
@@ -229,14 +229,14 @@ public abstract class Monitor extends Observable implements Observer {
     }
 
     private class GroupMonitorAdder implements Runnable {
-        private Group group;
         private String dependency;
         private Monitor parent;
+        private ParentBehavior component;
 
         public GroupMonitorAdder(Monitor parent, String dependency, ParentBehavior group) {
-            this.group = (Group)group;
             this.dependency = dependency;
             this.parent = parent;
+            this.component = group;
         }
 
         public void run() {
@@ -252,9 +252,9 @@ public abstract class Monitor extends Observable implements Observer {
                 try {
                     if(log.isDebugEnabled()) {
                         log.debug("Group monitor is going to be started for [group] "
-                                + group.getAlias());
+                                + dependency);
                     }
-                    monitor = AutoscalerUtil.getGroupMonitor(group.getGroup(dependency));
+                    monitor = AutoscalerUtil.getGroupMonitor(component.getGroup(dependency));
                     monitor.addObserver(parent);
                     success = true;
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/4432a31c/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 0961b21..839bef7 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
@@ -129,6 +129,18 @@ public class ApplicationMonitor extends Monitor {
 
     }
 
+    public List<String> findClustersOfApplication(String appId) {
+        List<String> clusters = new ArrayList<String>();
+        //considering only one level
+        for(AbstractClusterMonitor monitor : this.abstractClusterMonitors.values()) {
+            clusters.add(monitor.getClusterId());
+        }
+        //TODO rest
+        return clusters;
+
+    }
+
+
     /**
      * Find the cluster monitor by traversing recursively in the hierarchical monitors.
      * @param clusterId