Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4F1E57005 for ; Fri, 7 Oct 2011 01:13:34 +0000 (UTC) Received: (qmail 53117 invoked by uid 500); 7 Oct 2011 01:13:34 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 53084 invoked by uid 500); 7 Oct 2011 01:13:34 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 53077 invoked by uid 99); 7 Oct 2011 01:13:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Oct 2011 01:13:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Oct 2011 01:13:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A7E3D23889E3 for ; Fri, 7 Oct 2011 01:13:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1179918 - in /hadoop/common/branches/branch-0.20-security-205: CHANGES.txt src/packages/hadoop-setup-conf.sh Date: Fri, 07 Oct 2011 01:13:10 -0000 To: common-commits@hadoop.apache.org From: eyang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111007011310.A7E3D23889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eyang Date: Fri Oct 7 01:13:10 2011 New Revision: 1179918 URL: http://svn.apache.org/viewvc?rev=1179918&view=rev Log: HADOOP-7724. Fixed hadoop-setup-conf.sh to put proxy user in core-site.xml. (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 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=1179918&r1=1179917&r2=1179918&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Fri Oct 7 01:13:10 2011 @@ -280,6 +280,9 @@ Release 0.20.205.0 - 2011.10.06 HDFS-2403. NamenodeWebHdfsMethods.generateDelegationToken(..) does not use the renewer parameter. (szetszwo) + HADOOP-7724. Fixed hadoop-setup-conf.sh to put proxy user in + core-site.xml. (Arpit Gupta via Eric Yang) + IMPROVEMENTS MAPREDUCE-2928. MR-2413 improvements (Eli Collins via mattf) 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=1179918&r1=1179917&r2=1179918&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 Fri Oct 7 01:13:10 2011 @@ -139,6 +139,7 @@ function addPropertyToXMLConf ######################################### function setupProxyUsers { + local conf_file="${HADOOP_CONF_DIR}/core-site.xml" #if hadoop proxy users are sent, setup hadoop proxy if [ ! -z $HADOOP_PROXY_USERS ] then @@ -156,10 +157,10 @@ function setupProxyUsers #determine the property names and values proxy_groups_property="hadoop.proxyuser.${user}.groups" proxy_groups_val="$groups" - addPropertyToXMLConf "${HADOOP_CONF_DIR}/hdfs-site.xml" "$proxy_groups_property" "$proxy_groups_val" + addPropertyToXMLConf "$conf_file" "$proxy_groups_property" "$proxy_groups_val" proxy_hosts_property="hadoop.proxyuser.${user}.hosts" proxy_hosts_val="$hosts" - addPropertyToXMLConf "${HADOOP_CONF_DIR}/hdfs-site.xml" "$proxy_hosts_property" "$proxy_hosts_val" + addPropertyToXMLConf "$conf_file" "$proxy_hosts_property" "$proxy_hosts_val" IFS=';' done IFS=$oldIFS