You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2012/05/09 07:24:47 UTC
svn commit: r1335925 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/php/orchestrator/Cluster.php hmc/php/orchestrator/ServiceComponent.php
Author: vgogate
Date: Wed May 9 05:24:47 2012
New Revision: 1335925
URL: http://svn.apache.org/viewvc?rev=1335925&view=rev
Log:
JIRA-193: Track nodes that timed out for puppet kicks by Hitesh Shah
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php
incubator/ambari/branches/ambari-186/hmc/php/orchestrator/ServiceComponent.php
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1335925&r1=1335924&r2=1335925&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed May 9 05:24:47 2012
@@ -2,6 +2,9 @@ Ambari Change log
Release 0.x.x - unreleased
+ AMBARI-193. Track nodes that timed out for puppet kicks (Hitesh Shah via
+ vgogate)
+
AMBARI-190. On a Single Node install, Nagios alert do not take affect until
hmc is restarted (Hitesh Shah via vgogate)
Modified: incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php?rev=1335925&r1=1335924&r2=1335925&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php Wed May 9 05:24:47 2012
@@ -124,6 +124,7 @@ class Cluster {
$opStatus = array( "nodeReport" =>
array ( "PUPPET_KICK_FAILED" => $result[KICKFAILED],
"PUPPET_OPERATION_FAILED" => $result[FAILEDNODES],
+ "PUPPET_OPERATION_TIMEDOUT" => $result[TIMEDOUTNODES],
"PUPPET_OPERATION_SUCCEEDED" => $result[SUCCESSFULLNODES]));
$this->logger->log_info("Persisting puppet report for uninstall HDP");
@@ -406,6 +407,7 @@ class Cluster {
$opStatus = array ( "nodeReport" =>
array ( "PUPPET_KICK_FAILED" => $result[KICKFAILED],
"PUPPET_OPERATION_FAILED" => $result[FAILEDNODES],
+ "PUPPET_OPERATION_TIMEDOUT" => $result[TIMEDOUTNODES],
"PUPPET_OPERATION_SUCCEEDED" => $result[SUCCESSFULLNODES]));
$this->logger->log_info("Persisting puppet report for deploying nodes");
@@ -491,6 +493,7 @@ class Cluster {
$opStatus = array ( "nodeReport" =>
array ( "PUPPET_KICK_FAILED" => $result[KICKFAILED],
"PUPPET_OPERATION_FAILED" => $result[FAILEDNODES],
+ "PUPPET_OPERATION_TIMEDOUT" => $result[TIMEDOUTNODES],
"PUPPET_OPERATION_SUCCEEDED" => $result[SUCCESSFULLNODES]));
$this->logger->log_info("Persisting puppet report for deploying nodes");
@@ -584,6 +587,7 @@ class Cluster {
$opStatus = array ( "nodeReport" =>
array ( "PUPPET_KICK_FAILED" => $result[KICKFAILED],
"PUPPET_OPERATION_FAILED" => $result[FAILEDNODES],
+ "PUPPET_OPERATION_TIMEDOUT" => $result[TIMEDOUTNODES],
"PUPPET_OPERATION_SUCCEEDED" => $result[SUCCESSFULLNODES]));
$this->logger->log_info("Persisting puppet report for install HDP");
Modified: incubator/ambari/branches/ambari-186/hmc/php/orchestrator/ServiceComponent.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/orchestrator/ServiceComponent.php?rev=1335925&r1=1335924&r2=1335925&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/orchestrator/ServiceComponent.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/orchestrator/ServiceComponent.php Wed May 9 05:24:47 2012
@@ -244,6 +244,7 @@ class ServiceComponent {
$opStatus = array ( "nodeReport" =>
array ( "PUPPET_KICK_FAILED" => $result[KICKFAILED],
"PUPPET_OPERATION_FAILED" => $result[FAILEDNODES],
+ "PUPPET_OPERATION_TIMEDOUT" => $result[TIMEDOUTNODES],
"PUPPET_OPERATION_SUCCEEDED" => $result[SUCCESSFULLNODES]));
$this->logger->log_info("Persisting puppet report for starting "
@@ -347,6 +348,7 @@ class ServiceComponent {
$opStatus = array ( "nodeReport" =>
array ( "PUPPET_KICK_FAILED" => $result[KICKFAILED],
"PUPPET_OPERATION_FAILED" => $result[FAILEDNODES],
+ "PUPPET_OPERATION_TIMEDOUT" => $result[TIMEDOUTNODES],
"PUPPET_OPERATION_SUCCEEDED" => $result[SUCCESSFULLNODES]));
$this->logger->log_info("Persisting puppet report for stopping "