Repository: ambari Updated Branches: refs/heads/trunk e8a996184 -> 4381561f9
AMBARI-19831. ADDENDUM. HDP 3.0 TP - Support changed configs and scripts for YARN/MR (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4381561f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4381561f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4381561f Branch: refs/heads/trunk Commit: 4381561f92aeb91b1a2b3cafff4a860efde81dff Parents: e8a9961 Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Fri Feb 10 13:09:12 2017 -0800 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Fri Feb 10 13:16:34 2017 -0800 ---------------------------------------------------------------------- .../common-services/YARN/3.0.0.3.0/package/scripts/service.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4381561f/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py index 78b2428..e0d6475 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/service.py @@ -44,7 +44,7 @@ def service(componentName, action='start', serviceName='yarn'): if serviceName == 'mapreduce' and componentName == 'historyserver': delete_pid_file = True daemon = format("{mapred_bin}/mr-jobhistory-daemon.sh") - pid_file = format("{mapred_pid_dir}/mapred-{mapred_user}-{componentName}.pid") + pid_file = format("{mapred_pid_dir}/hadoop-{mapred_user}-{componentName}.pid") usr = params.mapred_user log_dir = params.mapred_log_dir else: @@ -52,7 +52,7 @@ def service(componentName, action='start', serviceName='yarn'): # may not work correctly when stopping the service delete_pid_file = False daemon = format("{yarn_bin}/yarn-daemon.sh") - pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-{componentName}.pid") + pid_file = format("{yarn_pid_dir}/hadoop-{yarn_user}-{componentName}.pid") usr = params.yarn_user log_dir = params.yarn_log_dir