svn commit: r1485474 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard/step8_controller.js

[sr...@apache.org]

Author: srimanth
Date: Wed May 22 22:42:55 2013
New Revision: 1485474

URL: http://svn.apache.org/r1485474
Log:
AMBARI-2186. Hadoop2 - Handle dfs include/exclude properties. (srimanth)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485474&r1=1485473&r2=1485474&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 22 22:42:55 2013
@@ -887,6 +887,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2186. Hadoop2 - Handle dfs include/exclude properties. (srimanth)
+
  AMBARI-2179. Fix JDBC URLs for Oozie connecting to MySQL server. (yusaku)
 
  AMBARI-2178. Fix JDBC URLs for connecting to Oracle from Hive Metastore and

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1485474&r1=1485473&r2=1485474&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js Wed May 22 22:42:55 2013
@@ -1416,6 +1416,15 @@ App.WizardStep8Controller = Em.Controlle
     var hdfsSiteObj = this.get('configs').filterProperty('filename', 'hdfs-site.xml');
     var hdfsProperties = {};
     hdfsSiteObj.forEach(function (_configProperty) {
+
+      if (App.get('currentStackVersionNumber') >= '2.0.0') {
+        // TODO Remove temporary hack. This was added to not set
+        // dfs.hosts and dfs.hosts.exclude properties on HDP 2 stacks.
+        if ("dfs.hosts"==_configProperty.name || "dfs.hosts.exclude"==_configProperty.name) {
+          _configProperty.value = "";
+        }
+      }
+
       hdfsProperties[_configProperty.name] = _configProperty.value;
       this._recordHostOverrideFromObj(_configProperty, 'hdfs-site', 'version1', this);
       console.log("STEP*: name of the property is: " + _configProperty.name);