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:
