You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 05:19:52 UTC
svn commit: r1347348 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/php/puppet/PuppetInvoker.php
Author: vikram
Date: Thu Jun 7 03:19:52 2012
New Revision: 1347348
URL: http://svn.apache.org/viewvc?rev=1347348&view=rev
Log:
AMBARI-527. Increase number of puppet retries to recover from intermittent network issues. (Contributed by Jitendra)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347348&r1=1347347&r2=1347348&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 03:19:52 2012
@@ -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)
Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php?rev=1347348&r1=1347347&r2=1347348&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php Thu Jun 7 03:19:52 2012
@@ -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;