ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-12745 Nodemanagers fail to start because of wrong recovery.dir property (dsen)
Date Wed, 12 Aug 2015 15:43:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk fdb72ccdb -> def3da8a3


AMBARI-12745 Nodemanagers fail to start because of wrong recovery.dir property (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/def3da8a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/def3da8a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/def3da8a

Branch: refs/heads/trunk
Commit: def3da8a309a334d8391cb93a936075802af847d
Parents: fdb72cc
Author: Dmytro Sen <dsen@apache.org>
Authored: Wed Aug 12 18:43:40 2015 +0300
Committer: Dmytro Sen <dsen@apache.org>
Committed: Wed Aug 12 18:43:40 2015 +0300

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py                | 2 ++
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py                | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/def3da8a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index daca7c5..de776a5 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -261,6 +261,8 @@ hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
 yarn_user = config['configurations']['yarn-env']['yarn_user']
 user_group = config['configurations']['cluster-env']['user_group']
 artifact_dir = format("{tmp_dir}/AMBARI-artifacts/")
+# Need this for yarn.nodemanager.recovery.dir in yarn-site
+yarn_log_dir_prefix = config['configurations']['yarn-env']['yarn_log_dir_prefix']
 
 target = format("{hive_lib}/{jdbc_jar_name}")
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/def3da8a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 8eeedd7..a02594b 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -129,6 +129,8 @@ oozie_service_keytab = config['configurations']['oozie-site']['oozie.service.Had
 oozie_principal = config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.kerberos.principal']
 http_principal = config['configurations']['oozie-site']['oozie.authentication.kerberos.principal']
 oozie_site = config['configurations']['oozie-site']
+# Need this for yarn.nodemanager.recovery.dir in yarn-site
+yarn_log_dir_prefix = config['configurations']['yarn-env']['yarn_log_dir_prefix']
 
 if security_enabled and Script.is_hdp_stack_less_than("2.2"):
   #older versions of oozie have problems when using _HOST in principal


Mime
View raw message