You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/11/07 05:54:07 UTC
[2/4] ambari git commit: Revert "AMBARI-8174. Reverting all patches.
(swagle)"
Revert "AMBARI-8174. Reverting all patches. (swagle)"
This reverts commit c75578a41e80def8841dbebc566a80474f89a8fb.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e2201c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e2201c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e2201c0
Branch: refs/heads/branch-1.7.0
Commit: 4e2201c0da112219d21f6e1f4be106ecc4290ce3
Parents: f09a3ca
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Nov 6 20:50:55 2014 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Nov 6 20:50:55 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/4e2201c0/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 c177d9c..36fbc86 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/4e2201c0/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=""