You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/02/02 01:12:07 UTC
ambari git commit: AMBARI-19809. HDP 3.0 TP - failed to deploy YARN
configs because yarn-site creates conflicts since should not belong to
MAPREDUCE2 (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk e406234a7 -> c744cac60
AMBARI-19809. HDP 3.0 TP - failed to deploy YARN configs because yarn-site creates conflicts since should not belong to MAPREDUCE2 (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c744cac6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c744cac6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c744cac6
Branch: refs/heads/trunk
Commit: c744cac60ebe0ae4046278f7ef78fe20d0872b0e
Parents: e406234
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Tue Jan 31 15:49:52 2017 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Feb 1 17:12:53 2017 -0800
----------------------------------------------------------------------
.../main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml | 1 -
.../resources/common-services/YARN/3.0.0.3.0/service_advisor.py | 5 +++--
.../main/resources/stacks/HDP/3.0/services/YARN/metainfo.xml | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c744cac6/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
index a094cba..14eae07 100644
--- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml
@@ -381,7 +381,6 @@
<config-type>hdfs-site</config-type>
<config-type>hadoop-env</config-type>
<config-type>core-site</config-type>
- <config-type>yarn-site</config-type>
<config-type>mapred-site</config-type>
<config-type>mapred-env</config-type>
<config-type>ssl-client</config-type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/c744cac6/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 cd35b68..44bdf80 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
@@ -454,7 +454,7 @@ class YARNRecommender(service_advisor.ServiceAdvisor):
Note: All memory calculations are in MB, unless specified otherwise.
"""
- Logger.info("DBG: Entered updateLlapConfigs");
+ Logger.info("DBG: Entered updateLlapConfigs")
putHiveInteractiveSiteProperty = self.putProperty(configurations, YARNRecommender.HIVE_INTERACTIVE_SITE, services)
putHiveInteractiveSitePropertyAttribute = self.putPropertyAttribute(configurations, YARNRecommender.HIVE_INTERACTIVE_SITE)
putHiveInteractiveEnvProperty = self.putProperty(configurations, "hive-interactive-env", services)
@@ -1530,7 +1530,8 @@ class MAPREDUCE2Recommender(YARNRecommender):
def recommendMapReduce2ConfigurationsFromHDP22(self, configurations, clusterData, services, hosts):
# Needs to be able to access yarn-site
- # TODO, this is a hack that was introduced in 2015. =
+ # TODO, this is a hack that was introduced in 2015. The yarn-site configs will not actually be saved
+ # as part of MAPREDUCE2 because yarn-site doesn't belong to it according to its metainfo.xml
# MAPREDUCE2 Recommender first needs to call all methods from YARN Recommender
self.recommendYARNConfigurationsFromHDP206(configurations, clusterData, services, hosts)
self.recommendYARNConfigurationsFromHDP22(configurations, clusterData, services, hosts)
http://git-wip-us.apache.org/repos/asf/ambari/blob/c744cac6/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/metainfo.xml
index 41fe13d..2a5121a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/3.0/services/YARN/metainfo.xml
@@ -57,6 +57,8 @@
<displayName>MapReduce2</displayName>
<version>3.0.0.3.0</version>
<extends>common-services/MAPREDUCE2/3.0.0.3.0</extends>
+
+ <configuration-dir>configuration-mapred</configuration-dir>
<osSpecifics>
<osSpecific>