Repository: ambari Updated Branches: refs/heads/branch-2.6 9c5494840 -> 812ded6ca
AMBARI-22187. Non-root ambari user causes Express Upgrade to fail during checking HDFS safe mode phase (Piyush Chavhan via aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/812ded6c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/812ded6c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/812ded6c Branch: refs/heads/branch-2.6 Commit: 812ded6cabbc1203988d45321cb15bf4f6e3b294 Parents: 9c54948 Author: Andrew Onishuk <[email protected]> Authored: Tue Nov 28 11:13:00 2017 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Tue Nov 28 11:13:00 2017 +0200 ---------------------------------------------------------------------- .../4.0/services/HDFS/package/scripts/namenode_upgrade.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/812ded6c/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode_upgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode_upgrade.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode_upgrade.py index 5969fcf..f27bdd2 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode_upgrade.py +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HDFS/package/scripts/namenode_upgrade.py @@ -168,11 +168,11 @@ def reach_safemode_state(user, safemode_state, in_ha): original_state = SafeMode.UNKNOWN hostname = params.hostname - safemode_check = format("su - {user} -c 'hdfs dfsadmin -safemode get'") + safemode_check = format("hdfs dfsadmin -safemode get") grep_pattern = format("Safe mode is {safemode_state} in {hostname}") if in_ha else format("Safe mode is {safemode_state}") - safemode_check_with_grep = format("su - {user} -c 'hdfs dfsadmin -safemode get | grep \"{grep_pattern}\"'") - code, out = call(safemode_check) + safemode_check_with_grep = format("{safemode_check} | grep '{grep_pattern}'") + code, out = call(safemode_check, user=user) Logger.info("Command: %s\nCode: %d." % (safemode_check, code)) if code == 0 and out is not None: Logger.info(out) @@ -191,7 +191,7 @@ def reach_safemode_state(user, safemode_state, in_ha): logoutput=True, path=[params.hadoop_bin_dir]) - code, out = call(safemode_check_with_grep) + code, out = call(safemode_check_with_grep, user=user) Logger.info("Command: %s\nCode: %d. Out: %s" % (safemode_check_with_grep, code, out)) if code == 0: return (True, original_state)
