AMBARI-187: Syntax error in the puppet manifest in reconfiguration. By Jitendra Pandey

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

CHANGES.txt

@@ -2,6 +2,9 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-187. Syntax error in the puppet manifest in reconfiguration (Jitendra
+  Pandey via vgogate)
+
   AMBARI-193. Track nodes that timed out for puppet kicks (Hitesh Shah via
   vgogate)
 

hmc/php/frontend/configUtils.php

@@ -428,8 +428,9 @@ function validateConfigs($svcConfigs) {
 function handleHiveMysql($clusterName, &$finalProperties,
     $dbAccessor, $logHandle) {
   $services = $dbAccessor->getAllServicesInfo($clusterName);
+  $hostForMysql = $dbAccessor->getHostsForComponent($clusterName, "HIVE_MYSQL");
   if ( ($services["services"]["HIVE"]["isEnabled"] == 1) &&
-      (empty($finalProperties["hive_mysql_host"])) ) {
+      (empty($finalProperties["hive_mysql_host"])) && (empty($hostForMysql["hosts"])) ) {
     $logHandle->log_debug("Hive is enabled but mysql server is not set, set it up on hive server itself");
     $hostComponents = $dbAccessor->getHostsForComponent($clusterName, "HIVE_SERVER");
     $hiveServerHosts = array_keys($hostComponents["hosts"]);