Revert "AMBARI-8174. Reverting all patches. (swagle)" This reverts commit 24c39273ff0487c71f5688c14bf2ef8df9786210.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be0a3c15 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be0a3c15 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be0a3c15 Branch: refs/heads/trunk Commit: be0a3c15ec23e62cfa2ec9ae3ff542f77c823cd8 Parents: 742d404 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Thu Nov 6 20:57:56 2014 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Thu Nov 6 20:57:56 2014 -0800 ---------------------------------------------------------------------- .../HDP/2.0.6/services/HDFS/package/scripts/utils.py | 12 ++++++------ .../HDP/2.2/services/HDFS/configuration/hadoop-env.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/be0a3c15/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py index 150d0a4..08358f5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py @@ -101,13 +101,13 @@ def service(action=None, name=None, user=None, create_pid_dir=False, except OSError: pass # Process is not running pass - pass - # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root - # in secure mode. - if name == 'datanode' and user == 'root': - params.dn_proc_user = 'root' - hdfs.setup_hadoop_env(replace=True) + # Set HADOOP_SECURE_DN_USER correctly in hadoop-env if DN is running as root + # in secure mode. + if user == 'root': + params.dn_proc_user = 'root' + hdfs.setup_hadoop_env(replace=True) + pass pass hadoop_env_exports_str = '' http://git-wip-us.apache.org/repos/asf/ambari/blob/be0a3c15/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml index d186922..9b43c20 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml @@ -136,7 +136,7 @@ export JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH} export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS" HDFS_DN_PROC_USER={{dn_proc_user}} -if [ $HDFS_DN_PROC_USER == "root" ]; then +if [ $HDFS_DN_PROC_USER="root" ]; then export HADOOP_SECURE_DN_USER="{{hdfs_user}}" else export HADOOP_SECURE_DN_USER=""