Переглянути джерело

AMBARI-494. Fix node assignments not not allow slaves on master. (Contributed by Mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1347331 13f79535-47bb-0310-9956-ffa450edef68
Vikram Dixit K 13 роки тому
батько
коміт
efe375a8d0
2 змінених файлів з 6 додано та 4 видалено
  1. 2 0
      CHANGES.txt
  2. 4 4
      hmc/php/util/selectNodes.php

+ 2 - 0
CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-494. Fix node assignments not not allow slaves on master. (Mahadev via Vikram)
+
   AMBARI-493. Add rack_info as column in Hosts table (Hitesh via Vikram)
 
   AMBARI-492. make support for os check a bit more robust (Hitesh via Vikram)

+ 4 - 4
hmc/php/util/selectNodes.php

@@ -200,16 +200,16 @@ class SelectNodes {
     }
     if ($numNodes <= 5) {
       /* all slaves except for the namenode */
-      $excludeList = $this->getExcludeHosts($allHosts, array($masterToHost["NAMENODE"]));
+      $excludeList = $this->getExcludeHosts($allHosts, $masterToHost["NAMENODE"]);
       return $excludeList;
     }
     if ($numNodes > 5) {
       /* all slaves except for the namenode/JT/Hbase master */
       $excludeHosts = array();
-      array_push($excludeHosts, $masterToHost["NAMENODE"]);
-      array_push($excludeHosts, $masterToHost["JOBTRACKER"]);
+      array_push($excludeHosts, $masterToHost["NAMENODE"][0]);
+      array_push($excludeHosts, $masterToHost["JOBTRACKER"][0]);
       if (array_key_exists("HBASE", $services)) {
-        array_push($excludeHosts, $masterToHost["HBASE_MASTER"]);
+        array_push($excludeHosts, $masterToHost["HBASE_MASTER"][0]);
       }
       $excludeList = $this->getExcludeHosts($allHosts, $excludeHosts);
       return $excludeList;