Updated Branches: refs/heads/trunk ad0d9f0ea -> a8309ce09
AMBARI-3635: Property yarn.log.server.url cannot be changed on ui. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/a8309ce0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/a8309ce0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/a8309ce0 Branch: refs/heads/trunk Commit: a8309ce096107c0ccf6b08825baa2ab7b5686554 Parents: ad0d9f0 Author: Jaimin Jetly <[email protected]> Authored: Wed Oct 30 23:18:28 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Wed Oct 30 23:18:28 2013 -0700 ---------------------------------------------------------------------- .../HDP/2.0.6/services/YARN/configuration/yarn-site.xml | 8 ++++++++ .../2.0.6/services/YARN/configuration/yarn-site.xml | 8 ++++++++ ambari-web/app/data/HDP2/config_mapping.js | 7 ------- ambari-web/app/data/HDP2/site_properties.js | 9 +++++++++ ambari-web/app/models/service_config.js | 7 +++++++ 5 files changed, 32 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a8309ce0/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml index 4be078a..2c16e94 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/yarn-site.xml @@ -309,4 +309,12 @@ </description> </property> + <property> + <name>yarn.log.server.url</name> + <value>http://localhost:19888/jobhistory/logs</value> + <description> + URI for the HistoryServer's log resource + </description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a8309ce0/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml index 4be078a..2c16e94 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/YARN/configuration/yarn-site.xml @@ -309,4 +309,12 @@ </description> </property> + <property> + <name>yarn.log.server.url</name> + <value>http://localhost:19888/jobhistory/logs</value> + <description> + URI for the HistoryServer's log resource + </description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a8309ce0/ambari-web/app/data/HDP2/config_mapping.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js index 0e1c7ed..4521ce3 100644 --- a/ambari-web/app/data/HDP2/config_mapping.js +++ b/ambari-web/app/data/HDP2/config_mapping.js @@ -181,13 +181,6 @@ var configs = [ "value": "<templateName[0]>:8141", "filename": "yarn-site.xml" }, - { - "name": "yarn.log.server.url", - "templateName": ["hs_host"], - "foreignKey": null, - "value": "http://<templateName[0]>:19888/jobhistory/logs", - "filename": "yarn-site.xml" - }, /**********************************************mapred-site***************************************/ { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a8309ce0/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index 7326dc6..f362220 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -299,6 +299,15 @@ module.exports = "serviceName": "YARN", "category": "NodeManager" }, + { + "id": "site property", + "name": "yarn.log.server.url", + "displayName": "yarn.log.server.url", + "value": "", + "defaultValue": "", + "category": "Advanced", + "serviceName": "YARN" + }, /**********************************************MAPREDUCE2***************************************/ { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/a8309ce0/ambari-web/app/models/service_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js index 1f58466..0d1677b 100644 --- a/ambari-web/app/models/service_config.js +++ b/ambari-web/app/models/service_config.js @@ -248,6 +248,13 @@ App.ServiceConfigProperty = Ember.Object.extend({ case 'hs_host': this.set('value', masterComponentHostsInDB.filterProperty('component', 'HISTORYSERVER').mapProperty('hostName')); break; + case 'yarn.log.server.url': + var hsHost = masterComponentHostsInDB.filterProperty('component', 'HISTORYSERVER').mapProperty('hostName'); + var defaultValue = this.get('defaultValue'); + defaultValue = defaultValue.replace(/:\/\/(\w*)(?=:)/,'://' + hsHost); + this.set('defaultValue',defaultValue); + this.set('value',this.get('defaultValue')); + break; case 'rm_host': this.set('value', masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER').hostName); break;
