Repository: ambari Updated Branches: refs/heads/trunk 64b493c49 -> 1335fa957
AMBARI-20469. ADDENDUM. Add a new property to yarn-site.xml yarn.log.server.web-service.url (Madhuvanthi Radhakrishnan via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1335fa95 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1335fa95 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1335fa95 Branch: refs/heads/trunk Commit: 1335fa957c3072315f1c6ed9a7da6728cd81af5a Parents: 64b493c Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Fri Mar 17 11:17:11 2017 -0700 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Fri Mar 17 11:17:11 2017 -0700 ---------------------------------------------------------------------- .../YARN/3.0.0.3.0/configuration/yarn-site.xml | 4 ++-- .../common-services/YARN/3.0.0.3.0/service_advisor.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1335fa95/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml index 4fbd1e6..394fae3 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml @@ -1116,11 +1116,11 @@ yarn.node-labels.manager-class </property> <property> <type>yarn-site</type> - <name>yarn.resourcemanager.webapp.address</name> + <name>yarn.timeline-service.webapp.address</name> </property> <property> <type>yarn-site</type> - <name>yarn.resourcemanager.webapp.https.address</name> + <name>yarn.timeline-service.webapp.https.address</name> </property> </depends-on> <on-ambari-upgrade add="false"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/1335fa95/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py index 16d5bbc..e831d14 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py @@ -474,11 +474,11 @@ class YARNRecommender(service_advisor.ServiceAdvisor): else: Logger.error("Required config yarn.timeline-service.webapp.address in yarn-site does not exist. Unable to set yarn.log.server.web-service.url") else: - if "yarn.timeline-service.webapp.https.address" in services["configurations"]["yarn-site"]["properties"]: - webapp_address = services["configurations"]["yarn-site"]["properties"]["yarn.timeline-service.webapp.https.address"] - webservice_url = "https://"+webapp_address+"/ws/v1/applicationhistory"; - else: - Logger.error("Required config yarn.timeline-service.webapp.https.address in yarn-site does not exist. Unable to set yarn.log.server.web-service.url") + if "yarn.timeline-service.webapp.https.address" in services["configurations"]["yarn-site"]["properties"]: + webapp_address = services["configurations"]["yarn-site"]["properties"]["yarn.timeline-service.webapp.https.address"] + webservice_url = "https://"+webapp_address+"/ws/v1/applicationhistory"; + else: + Logger.error("Required config yarn.timeline-service.webapp.https.address in yarn-site does not exist. Unable to set yarn.log.server.web-service.url") putYarnSiteProperty('yarn.log.server.web-service.url',webservice_url ) if ranger_yarn_plugin_enabled and 'ranger-yarn-plugin-properties' in services['configurations'] and 'REPOSITORY_CONFIG_USERNAME' in services['configurations']['ranger-yarn-plugin-properties']['properties']:
