You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ey...@apache.org on 2011/10/05 02:41:02 UTC
svn commit: r1179028 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt src/packages/hadoop-setup-conf.sh
src/packages/templates/conf/core-site.xml
Author: eyang
Date: Wed Oct 5 00:41:02 2011
New Revision: 1179028
URL: http://svn.apache.org/viewvc?rev=1179028&view=rev
Log:
HADOOP-7720. Added parameter for HBase user to setup config script.
(Arpit Gupta via Eric Yang)
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh
hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/core-site.xml
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1179028&r1=1179027&r2=1179028&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Wed Oct 5 00:41:02 2011
@@ -359,6 +359,9 @@ Release 0.20.205.0 - 2011.09.28
HADOOP-7707. Added toggle for dfs.support.append, webhdfs and hadoop proxy
user to setup config script. (Arpit Gupta via Eric Yang)
+ HADOOP-7720. Added parameter for HBase user to setup config script.
+ (Arpit Gupta via Eric Yang)
+
Release 0.20.204.0 - 2011-8-25
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh?rev=1179028&r1=1179027&r2=1179028&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh Wed Oct 5 00:41:02 2011
@@ -54,6 +54,7 @@ usage: $0 <parameters>
--dfs-webhdfs-enabled=false|true Enable webhdfs
--dfs-support-append=false|true Enable append
--hadoop-proxy-users='user1:groups:hosts;user2:groups:hosts' Setup proxy users for hadoop
+ --hbase-user=hbase User which hbase is running as. Defaults to hbase
"
exit 1
}
@@ -196,6 +197,7 @@ OPTS=$(getopt \
-l 'dfs-webhdfs-enabled:' \
-l 'hadoop-proxy-users:' \
-l 'dfs-support-append:' \
+ -l 'hbase-user:' \
-o 'h' \
-- "$@")
@@ -327,6 +329,10 @@ while true ; do
DFS_SUPPORT_APPEND=$2; shift 2
AUTOMATED=1
;;
+ --hbase-user)
+ HBASE_USER=$2; shift 2
+ AUTOMATED=1
+ ;;
--)
shift ; break
;;
@@ -355,6 +361,9 @@ HADOOP_REPLICATION=${HADOOP_RELICATION:-
HADOOP_TASK_SCHEDULER=${HADOOP_TASK_SCHEDULER:-org.apache.hadoop.mapred.JobQueueTaskScheduler}
HADOOP_HDFS_USER=${HADOOP_HDFS_USER:-hdfs}
HADOOP_MR_USER=${HADOOP_MR_USER:-mr}
+DFS_WEBHDFS_ENABLED=${DFS_WEBHDFS_ENABLED:-false}
+DFS_SUPPORT_APPEND=${DFS_SUPPORT_APPEND:-false}
+HBASE_USER=${HBASE_USER:-hbase}
KEYTAB_DIR=${KEYTAB_DIR:-/etc/security/keytabs}
HDFS_KEYTAB=${HDFS_KEYTAB:-/home/hdfs/hdfs.keytab}
MR_KEYTAB=${MR_KEYTAB:-/home/mr/mr.keytab}
Modified: hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/core-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/core-site.xml?rev=1179028&r1=1179027&r2=1179028&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/core-site.xml (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/core-site.xml Wed Oct 5 00:41:02 2011
@@ -33,13 +33,13 @@
<name>hadoop.security.auth_to_local</name>
<value>
RULE:[2:$1@$0]([jt]t@.*${KERBEROS_REALM})s/.*/${HADOOP_MR_USER}/
- RULE:[2:$1@$0](hm@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
- RULE:[2:$1@$0](rs@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
RULE:[2:$1@$0]([nd]n@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
RULE:[2:$1@$0](mapred@.*${KERBEROS_REALM})s/.*/${HADOOP_MR_USER}/
RULE:[2:$1@$0](hdfs@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
RULE:[2:$1@$0](mapredqa@.*${KERBEROS_REALM})s/.*/${HADOOP_MR_USER}/
RULE:[2:$1@$0](hdfsqa@.*${KERBEROS_REALM})s/.*/${HADOOP_HDFS_USER}/
+ RULE:[2:$1@$0](hm@.*${KERBEROS_REALM})s/.*/${HBASE_USER}/
+ RULE:[2:$1@$0](rs@.*${KERBEROS_REALM})s/.*/${HBASE_USER}/
DEFAULT
</value>
<description></description>