AMBARI-527. Increase number of puppet retries to recover from intermittent network issues. (Contributed by Jitendra)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1347348 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-527. Increase number of puppet retries to recover from intermittent network issues. (Jitendra via Vikram)
+
   AMBARI-502. X button missing from popup (Yusaku via Vikram)
 
   AMBARI-501. Speed up page load/reload times (Yusaku via Vikram)

hmc/php/puppet/PuppetInvoker.php

@@ -87,13 +87,15 @@
       $kickFailedNodes = array();
       $this->sendKick($nodes, $txnId, $kickFailedNodes,
           $successNodes, $prevKickRunningNodes);
-      if (!empty($kickFailedNodes)) {
-        $this->logger->log_warn("Retrying kick after 10 seconds on " . print_r($kickFailedNodes, TRUE));
-        sleep(10);
-        $nodesToKick = $kickFailedNodes;
-        $kickFailedNodes = array();
-        $this->sendKick($nodesToKick, $txnId, $kickFailedNodes,
-            $successNodes, $prevKickRunningNodes);
+      $numRetry = 3;
+      while ( ($numRetry > 0) && (!empty($kickFailedNodes))) {
+          $numRetry = $numRetry - 1;
+          $this->logger->log_warn("Retrying kick after 10 seconds on " . print_r($kickFailedNodes, TRUE));
+          sleep(10);
+          $nodesToKick = $kickFailedNodes;
+          $kickFailedNodes = array();
+          $this->sendKick($nodesToKick, $txnId, $kickFailedNodes,
+              $successNodes, $prevKickRunningNodes);
       }
       foreach ($kickFailedNodes as $fn) {
         $failedNodes[] = $fn;