Browse Source

AMBARI-206. Fix undefined variable in orchestrator. (hitest via omalley)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1337215 13f79535-47bb-0310-9956-ffa450edef68
Owen O'Malley 13 years ago
parent
commit
4195d076ad
2 changed files with 7 additions and 3 deletions
  1. 2 0
      CHANGES.txt
  2. 5 3
      hmc/php/puppet/PuppetInvoker.php

+ 2 - 0
CHANGES.txt

@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-206. Fix undefined variable in orchestrator. (hitest via omalley)
+
   AMBARI-208. Support filtering hosts based on discovery status. (hitesh
   via omalley)
 

+ 5 - 3
hmc/php/puppet/PuppetInvoker.php

@@ -176,7 +176,7 @@
      *This is public only for testing, don't use this method directly
      */
     public function genKickWait($nodes, $txnId, $clusterId, $hostInfo,
-            $configInfo, $hostRolesStates, $hostAttributes, $manifestDir, $versionFile, 
+            $configInfo, $hostRolesStates, $hostAttributes, $manifestDir, $versionFile,
             $dryRun) {
       $failedNodes = array();
       $kickedNodes = array();
@@ -197,14 +197,16 @@
         return array( "result" => 0 , "error" => "",
             KICKFAILED => array(),
             FAILEDNODES => array(),
-            SUCCESSFULLNODES => array()
+            SUCCESSFULLNODES => array(),
+            TIMEDOUTNODES => array()
         );
       }
       if ($dryRun) {
         return array( "result" => 0 , "error" => "",
             KICKFAILED => array(),
             FAILEDNODES => array(),
-            SUCCESSFULLNODES => $nodes
+            SUCCESSFULLNODES => $nodes,
+            TIMEDOUTNODES => array()
         );
       }
       if (count($kickedNodes) > 0) {