Selaa lähdekoodia

JIRA-193: Track nodes that timed out for puppet kicks by Hitesh Shah

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1335925 13f79535-47bb-0310-9956-ffa450edef68
Suhas 13 vuotta sitten
vanhempi
commit
206e7fbded
3 muutettua tiedostoa jossa 9 lisäystä ja 0 poistoa
  1. 3 0
      CHANGES.txt
  2. 4 0
      hmc/php/orchestrator/Cluster.php
  3. 2 0
      hmc/php/orchestrator/ServiceComponent.php

+ 3 - 0
CHANGES.txt

@@ -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)
 

+ 4 - 0
hmc/php/orchestrator/Cluster.php

@@ -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");

+ 2 - 0
hmc/php/orchestrator/ServiceComponent.php

@@ -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 "