You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by hi...@apache.org on 2012/10/25 02:49:43 UTC
svn commit: r1401936 - in /incubator/ambari/branches/AMBARI-666: AMBARI-666-CHANGES.txt ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

Author: hitesh
Date: Thu Oct 25 00:49:43 2012
New Revision: 1401936

URL: http://svn.apache.org/viewvc?rev=1401936&view=rev
Log:
AMBARI-909. Pass correct cluster info to Action Manager. (Contributed by hitesh)

Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1401936&r1=1401935&r2=1401936&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Thu Oct 25 00:49:43 2012
@@ -357,6 +357,8 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-909. Pass correct cluster info to Action Manager. (hitesh)
+
   AMBARI-904. Ensure state changes only happen after actionmanager persists
   actions. (hitesh)
 

Modified: incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java?rev=1401936&r1=1401935&r2=1401936&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java Thu Oct 25 00:49:43 2012
@@ -57,6 +57,7 @@ import org.apache.ambari.server.state.St
 import org.apache.ambari.server.state.svccomphost.ServiceComponentHostInstallEvent;
 import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartEvent;
 import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStopEvent;
+import org.apache.ambari.server.utils.StageUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -751,7 +752,8 @@ public class AmbariManagementControllerI
     return stage;
   }
 
-  private void createHostAction(Stage stage, ServiceComponentHost scHost,
+  private void createHostAction(Cluster cluster,
+      Stage stage, ServiceComponentHost scHost,
       Map<String, Config> configs,
       RoleCommand command,
       long nowTimestamp,
@@ -769,11 +771,8 @@ public class AmbariManagementControllerI
     Map<String, List<String>> clusterHostInfo =
         new TreeMap<String, List<String>>();
 
-    // TODO hack alert
-    List<String> slaveHostList = new ArrayList<String>();
-    slaveHostList.add("localhost");
-    clusterHostInfo.put("slave_hosts", slaveHostList);
-    execCmd.setClusterHostInfo(clusterHostInfo);
+    execCmd.setClusterHostInfo(
+        StageUtils.getClusterHostInfo(cluster));
 
     // TODO do something from configs here
     Map<String, Map<String, String>> configurations =
@@ -1243,7 +1242,7 @@ public class AmbariManagementControllerI
           }
 
           Map<String, Config> configs = scHost.getDesiredConfigs();
-          createHostAction(stage, scHost, configs, roleCommand,
+          createHostAction(cluster, stage, scHost, configs, roleCommand,
             nowTimestamp, event);
         }
       }