svn commit: r1222001 - in /incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller: Clusters.java Controller.java

[vg...@apache.org]

Author: vgogate
Date: Thu Dec 22 02:29:28 2011
New Revision: 1222001

URL: http://svn.apache.org/viewvc?rev=1222001&view=rev
Log:
AMBARI-170. Update the cluster state after state machine transitions it to final ACTIVE/INACTIVE state

Modified:
    incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java
    incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java

Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java?rev=1222001&r1=1222000&r2=1222001&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java Thu Dec 22 02:29:28 2011
@@ -81,7 +81,6 @@ public class Clusters {
       this.clusterFactory = clusterFactory;
       this.fsmDriver = fsmDriver;
       this.flattener = flattener;
-      recoverClustersStateAfterRestart();
     }
     
     /*
@@ -841,7 +840,7 @@ public class Clusters {
   /*
    * Restart recovery for clusters
    */
-  private void recoverClustersStateAfterRestart () throws Exception {
+  void recoverClustersStateAfterRestart () throws Exception {
       for (Cluster cls : this.getClustersList("ALL")) {
           ClusterDefinition cdef = cls.getClusterDefinition(-1);
           this.validateClusterDefinition (cdef.getName(), cdef);

Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java?rev=1222001&r1=1222000&r2=1222001&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Controller.java Thu Dec 22 02:29:28 2011
@@ -27,10 +27,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.ambari.common.util.DaemonWatcher;
 import org.apache.ambari.common.util.ExceptionUtil;
 import org.mortbay.jetty.Server;
-import org.mortbay.jetty.security.Constraint;
-import org.mortbay.jetty.security.ConstraintMapping;
-import org.mortbay.jetty.security.HashUserRealm;
-import org.mortbay.jetty.security.SecurityHandler;
+
 import org.mortbay.jetty.servlet.Context;
 import org.mortbay.jetty.servlet.DefaultServlet;
 import org.mortbay.jetty.servlet.ServletHolder;
@@ -123,6 +120,8 @@ public class Controller {
     Injector injector = Guice.createInjector(new ControllerModule());
     DaemonWatcher.createInstance(System.getProperty("PID"), 9100);
     try {
+      Clusters clusters = injector.getInstance(Clusters.class);
+      clusters.recoverClustersStateAfterRestart();
       Controller controller = injector.getInstance(Controller.class);
       if (controller != null) {
         controller.run();