Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 28517 invoked from network); 13 May 2010 21:07:00 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 13 May 2010 21:07:00 -0000 Received: (qmail 35343 invoked by uid 500); 13 May 2010 21:07:00 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 35301 invoked by uid 500); 13 May 2010 21:07:00 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 35293 invoked by uid 99); 13 May 2010 21:07:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 May 2010 21:07:00 +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; Thu, 13 May 2010 21:06:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 32A3423889CB; Thu, 13 May 2010 21:06:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r944015 - in /hadoop/hdfs/trunk: ./ src/java/org/apache/hadoop/hdfs/protocol/ src/java/org/apache/hadoop/hdfs/server/protocol/ Date: Thu, 13 May 2010 21:06:36 -0000 To: hdfs-commits@hadoop.apache.org From: boryas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100513210636.32A3423889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: boryas Date: Thu May 13 21:06:35 2010 New Revision: 944015 URL: http://svn.apache.org/viewvc?rev=944015&view=rev Log: HDFS-1003.authorization checks for inter-server protocol (based on HADOOP-6600) Modified: hadoop/hdfs/trunk/CHANGES.txt hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/InterDatanodeProtocol.java hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java Modified: hadoop/hdfs/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=944015&r1=944014&r2=944015&view=diff ============================================================================== --- hadoop/hdfs/trunk/CHANGES.txt (original) +++ hadoop/hdfs/trunk/CHANGES.txt Thu May 13 21:06:35 2010 @@ -4,6 +4,9 @@ Trunk (unreleased changes) IMPROVEMENTS + HDFS-1003. authorization checks for inter-server protocol + (based on HADOOP-6600) (boryas) + HDFS-1061. Memory footprint optimization for INodeFile object. (Bharath Mundlapudi via jghoman) Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java?rev=944015&r1=944014&r2=944015&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java (original) +++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java Thu May 13 21:06:35 2010 @@ -50,7 +50,8 @@ import org.apache.hadoop.hdfs.security.t * as well as open/close file streams, etc. * **********************************************************************/ -@KerberosInfo(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY) +@KerberosInfo( + serverPrincipal = DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY) @TokenInfo(DelegationTokenSelector.class) public interface ClientProtocol extends VersionedProtocol { Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java?rev=944015&r1=944014&r2=944015&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java (original) +++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java Thu May 13 21:06:35 2010 @@ -37,7 +37,9 @@ import org.apache.avro.reflect.Nullable; * returning values from these functions. * **********************************************************************/ -@KerberosInfo(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY) +@KerberosInfo( + serverPrincipal = DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY, + clientPrincipal = DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY) public interface DatanodeProtocol extends VersionedProtocol { /** * 24: register() renamed registerDatanode() Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/InterDatanodeProtocol.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/InterDatanodeProtocol.java?rev=944015&r1=944014&r2=944015&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/InterDatanodeProtocol.java (original) +++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/InterDatanodeProtocol.java Thu May 13 21:06:35 2010 @@ -30,7 +30,9 @@ import org.apache.hadoop.security.Kerber /** An inter-datanode protocol for updating generation stamp */ -@KerberosInfo(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY) +@KerberosInfo( + serverPrincipal = DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY, + clientPrincipal = DFSConfigKeys.DFS_DATANODE_USER_NAME_KEY) public interface InterDatanodeProtocol extends VersionedProtocol { public static final Log LOG = LogFactory.getLog(InterDatanodeProtocol.class); Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java?rev=944015&r1=944014&r2=944015&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java (original) +++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java Thu May 13 21:06:35 2010 @@ -31,7 +31,9 @@ import org.apache.hadoop.security.Kerber * Protocol that a secondary NameNode uses to communicate with the NameNode. * It's used to get part of the name node state *****************************************************************************/ -@KerberosInfo(DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY) +@KerberosInfo( + serverPrincipal = DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY, + clientPrincipal = DFSConfigKeys.DFS_NAMENODE_USER_NAME_KEY) public interface NamenodeProtocol extends VersionedProtocol { /** * Compared to the previous version the following changes have been introduced: