Repository: ambari Updated Branches: refs/heads/branch-2.5 3e0d02145 -> b76396164 refs/heads/trunk 08342b3cb -> 89b9cf5be
AMBARI-19083. After ambari only upgrade Enable security(Configure Ambari Identity) was failed because could not run "ambari-sudo.sh" (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/89b9cf5b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/89b9cf5b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/89b9cf5b Branch: refs/heads/trunk Commit: 89b9cf5beb1304b0d90dad00b371947a3c467e8a Parents: 08342b3 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Dec 5 15:23:58 2016 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Dec 5 15:23:58 2016 +0200 ---------------------------------------------------------------------- ambari-server/src/main/python/ambari_server_main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/89b9cf5b/ambari-server/src/main/python/ambari_server_main.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server_main.py b/ambari-server/src/main/python/ambari_server_main.py index b642cea..dbcafa4 100644 --- a/ambari-server/src/main/python/ambari_server_main.py +++ b/ambari-server/src/main/python/ambari_server_main.py @@ -28,6 +28,7 @@ from ambari_commons.logging_utils import get_debug_mode, print_warning_msg, prin from ambari_commons.os_check import OSConst from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons.os_utils import is_root, run_os_command +from ambari_server.ambariPath import AmbariPath from ambari_server.dbConfiguration import ensure_dbms_is_running, ensure_jdbc_driver_is_installed from ambari_server.serverConfiguration import configDefaults, find_jdk, get_ambari_properties, \ get_conf_dir, get_is_persisted, get_is_secure, get_java_exe_path, get_original_master_key, read_ambari_user, \ @@ -121,6 +122,8 @@ AMBARI_SERVER_NOT_STARTED_MSG = "Ambari Server java process hasn't been started ULIMIT_OPEN_FILES_KEY = 'ulimit.open.files' ULIMIT_OPEN_FILES_DEFAULT = 10000 +AMBARI_ENV_FILE = AmbariPath.get("/var/lib/ambari-server/ambari-env.sh") + @OsFamilyFuncImpl(OSConst.WINSRV_FAMILY) def ensure_server_security_is_configured(): pass @@ -179,9 +182,10 @@ def generate_child_process_param_list(ambari_user, java_exe, class_path, # from subprocess, we have to skip --login option of su command. That's why # we change dir to / (otherwise subprocess can face with 'permission denied' # errors while trying to list current directory - cmd = "{ulimit_cmd} ; {su} {ambari_user} -s {sh_shell} -c '{command}'".format(ulimit_cmd=ulimit_cmd, + cmd = "{ulimit_cmd} ; {su} {ambari_user} -s {sh_shell} -c 'source {ambari_env_file} ; {command}'".format(ulimit_cmd=ulimit_cmd, su=locate_file('su', '/bin'), ambari_user=ambari_user, - sh_shell=locate_file('sh', '/bin'), command=command) + sh_shell=locate_file('sh', '/bin'), command=command, + ambari_env_file=AMBARI_ENV_FILE) else: cmd = "{ulimit_cmd} ; {command}".format(ulimit_cmd=ulimit_cmd, command=command)
