Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 13564 invoked from network); 5 May 2010 04:56:58 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 May 2010 04:56:58 -0000 Received: (qmail 22185 invoked by uid 500); 5 May 2010 04:56:57 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 22121 invoked by uid 500); 5 May 2010 04:56:56 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 22101 invoked by uid 99); 5 May 2010 04:56:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 04:56:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 05 May 2010 04:56:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A94323888E8; Wed, 5 May 2010 04:56:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r941145 - in /hadoop/mapreduce/branches/branch-0.21: ./ conf/ src/java/org/apache/hadoop/mapred/ src/test/mapred/org/apache/hadoop/mapred/ Date: Wed, 05 May 2010 04:56:02 -0000 To: mapreduce-commits@hadoop.apache.org From: sharad@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100505045602.3A94323888E8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sharad Date: Wed May 5 04:56:01 2010 New Revision: 941145 URL: http://svn.apache.org/viewvc?rev=941145&view=rev Log: MAPREDUCE-1611. Merge revision 941143 from trunk. Added: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/TestAdminOperationsProtocolWithServiceAuthorization.java - copied unchanged from r941143, hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestAdminOperationsProtocolWithServiceAuthorization.java Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt hadoop/mapreduce/branches/branch-0.21/conf/hadoop-policy.xml.template hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=941145&r1=941144&r2=941145&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original) +++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Wed May 5 04:56:01 2010 @@ -1543,3 +1543,6 @@ Release 0.21.0 - Unreleased displays wrong error message about job ACLs. (Ravi Gummadi via vinodkv) MAPREDUCE-1727. TestJobACLs fails after HADOOP-6686. (Ravi Gummadi via vinodkv) + + MAPREDUCE-1611. Refresh nodes and refresh queues doesnt work with service + authorization enabled. (Amar Kamat via vinodkv) Modified: hadoop/mapreduce/branches/branch-0.21/conf/hadoop-policy.xml.template URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/conf/hadoop-policy.xml.template?rev=941145&r1=941144&r2=941145&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/conf/hadoop-policy.xml.template (original) +++ hadoop/mapreduce/branches/branch-0.21/conf/hadoop-policy.xml.template Wed May 5 04:56:01 2010 @@ -94,4 +94,13 @@ A special value of "*" means all users are allowed. + + security.admin.operations.protocol.acl + * + ACL for AdminOperationsProtocol, used by the mradmins commands + to refresh queues and nodes at JobTracker. The ACL is a comma-separated list of + user and group names. The user and group list is separated by a blank. + For e.g. "alice,bob users,wheel". A special value of "*" means all users are + allowed. + Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java?rev=941145&r1=941144&r2=941145&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java Wed May 5 04:56:01 2010 @@ -39,6 +39,8 @@ public class MapReducePolicyProvider ext RefreshAuthorizationPolicyProtocol.class), new Service("security.refresh.usertogroups.mappings.protocol.acl", RefreshUserToGroupMappingsProtocol.class), + new Service("security.admin.operations.protocol.acl", + AdminOperationsProtocol.class), }; @Override