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 04:35:05 UTC
svn commit: r1347331 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/php/util/selectNodes.php
Author: vikram
Date: Thu Jun 7 02:35:05 2012
New Revision: 1347331
URL: http://svn.apache.org/viewvc?rev=1347331&view=rev
Log:
AMBARI-494. Fix node assignments not not allow slaves on master. (Contributed by Mahadev)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/php/util/selectNodes.php
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347331&r1=1347330&r2=1347331&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 02:35:05 2012
@@ -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)
Modified: incubator/ambari/branches/ambari-186/hmc/php/util/selectNodes.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/util/selectNodes.php?rev=1347331&r1=1347330&r2=1347331&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/util/selectNodes.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/util/selectNodes.php Thu Jun 7 02:35:05 2012
@@ -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;