Repository: ambari Updated Branches: refs/heads/trunk 454b31fd2 -> 640a283ae
AMBARI-9369 : Enable Namenode HA wizard on Windows by default recommends dfs.journalnode.edits.dir as /hadoop/hdfs/journal (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/640a283a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/640a283a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/640a283a Branch: refs/heads/trunk Commit: 640a283aef3b0e616dbe9c2ff21402af47d23282 Parents: 454b31f Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Wed Jan 28 11:20:32 2015 -0800 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Wed Jan 28 11:20:32 2015 -0800 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari_server_main.py | 1 + .../2.1/services/HDFS/configuration/hdfs-site.xml | 6 ++++++ .../2.2/services/HDFS/configuration/hdfs-site.xml | 6 ------ .../admin/highAvailability/nameNode/step3_controller.js | 5 +++++ ambari-web/app/utils/config.js | 12 +++++++----- 5 files changed, 19 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/640a283a/ambari-server/src/main/python/ambari_server_main.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server_main.py b/ambari-server/src/main/python/ambari_server_main.py index e655eb2..6bd4f19 100644 --- a/ambari-server/src/main/python/ambari_server_main.py +++ b/ambari-server/src/main/python/ambari_server_main.py @@ -150,6 +150,7 @@ def get_ulimit_open_files(properties): @OsFamilyFuncImpl(OSConst.WINSRV_FAMILY) def generate_child_process_param_list(ambari_user, current_user, java_exe, class_path, debug_start, suspend_mode): + conf_dir = class_path if class_path.find(' ') != -1: conf_dir = '"' + class_path + '"' command_base = SERVER_START_CMD_DEBUG_WINDOWS if debug_start else SERVER_START_CMD_WINDOWS http://git-wip-us.apache.org/repos/asf/ambari/blob/640a283a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml index 63e4c95..b235da4 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/configuration/hdfs-site.xml @@ -79,4 +79,10 @@ <name>dfs.domain.socket.path</name> <deleted>true</deleted> </property> + <property> + <name>dfs.journalnode.edits.dir</name> + <value>c:\hadoop\hdfs\journalnode</value> + <description>The path where the JournalNode daemon will store its local state. </description> + </property> + </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/640a283a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml index 97d5865..de4664a 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HDFS/configuration/hdfs-site.xml @@ -28,10 +28,4 @@ <description></description> </property> - <property> - <name>dfs.journalnode.edits.dir</name> - <value>/hadoop/hdfs/journalnode</value> - <description>The path where the JournalNode daemon will store its local state. </description> - </property> - </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/640a283a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js index 36d6e92..83b4ed0 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js @@ -127,6 +127,11 @@ App.HighAvailabilityWizardStep3Controller = Em.Controller.extend({ var value = this.get('serverConfigData.items').findProperty('type', 'hbase-site').properties['hbase.rootdir'].replace(/\/\/[^\/]*/, '//' + nameServiceId); this.setConfigInitialValue(config,value); } + config = configs.findProperty('name','dfs.journalnode.edits.dir'); + if (App.get('isHadoopWindowsStack') && App.Service.find().someProperty('serviceName', 'HDFS')) { + var value = this.get('serverConfigData.items').findProperty('type', 'hdfs-site').properties['dfs.journalnode.edits.dir']; + this.setConfigInitialValue(config, value); + } }, setConfigInitialValue: function(config,value) { http://git-wip-us.apache.org/repos/asf/ambari/blob/640a283a/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 91c64b7..d79ebaa 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -917,11 +917,13 @@ App.config = Em.Object.create({ loadAdvancedConfigPartialSuccess: function(data, opt, params, request) { var properties = []; - var configurations = data.items.mapProperty('configurations').reduce(function(p,c) { return p.concat(c); }); - configurations.forEach(function(item) { - var property = this.createAdvancedPropertyObject(item.StackConfigurations); - if (property) properties.push(property); - }, this); + if(data.items.length && data.items.mapProperty('configurations').length) { + var configurations = data.items.mapProperty('configurations').reduce(function(p,c) { return p.concat(c); }); + configurations.forEach(function(item) { + var property = this.createAdvancedPropertyObject(item.StackConfigurations); + if (property) properties.push(property); + }, this); + } params.callback(properties, request); },
