Browse Source

AMBARI-2186. Hadoop2 - Handle dfs include/exclude properties. (srimanth)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1485474 13f79535-47bb-0310-9956-ffa450edef68
Srimanth 12 years ago
parent
commit
8976ef093a
2 changed files with 11 additions and 0 deletions
  1. 2 0
      CHANGES.txt
  2. 9 0
      ambari-web/app/controllers/wizard/step8_controller.js

+ 2 - 0
CHANGES.txt

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

+ 9 - 0
ambari-web/app/controllers/wizard/step8_controller.js

@@ -1416,6 +1416,15 @@ App.WizardStep8Controller = Em.Controller.extend({
     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);