Author: brandonli
Date: Thu May 29 21:16:04 2014
New Revision: 1598405
URL: http://svn.apache.org/r1598405
Log:
HDFS-6462. NFS: fsstat request fails with the secure hdfs. Contributed by
Brandon Li
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java?rev=1598405&r1=1598404&r2=1598405&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
Thu May 29 21:16:04 2014
@@ -44,7 +44,6 @@ import org.apache.hadoop.hdfs.client.Hdf
import org.apache.hadoop.hdfs.protocol.DirectoryListing;
import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
-import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.nfs.AccessPrivilege;
import org.apache.hadoop.nfs.NfsExports;
@@ -152,13 +151,6 @@ public class RpcProgramNfs3 extends RpcP
private final NfsExports exports;
- /**
- * superUserClient should always impersonate HDFS file system owner to send
- * requests which requires supergroup privilege. This requires the same user
- * to start HDFS and NFS.
- */
- private final DFSClient superUserClient;
-
private final short replication;
private final long blockSize;
private final int bufferSize;
@@ -180,7 +172,6 @@ public class RpcProgramNfs3 extends RpcP
exports = NfsExports.getInstance(config);
writeManager = new WriteManager(iug, config);
clientCache = new DFSClientCache(config);
- superUserClient = new DFSClient(NameNode.getAddress(config), config);
replication = (short) config.getInt(DFSConfigKeys.DFS_REPLICATION_KEY,
DFSConfigKeys.DFS_REPLICATION_DEFAULT);
blockSize = config.getLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY,
@@ -1681,8 +1672,7 @@ public class RpcProgramNfs3 extends RpcP
}
try {
- // Use superUserClient to get file system status
- FsStatus fsStatus = superUserClient.getDiskStatus();
+ FsStatus fsStatus = dfsClient.getDiskStatus();
long totalBytes = fsStatus.getCapacity();
long freeBytes = fsStatus.getRemaining();
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1598405&r1=1598404&r2=1598405&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu May 29
21:16:04 2014
@@ -610,6 +610,8 @@ Release 2.5.0 - UNRELEASED
HDFS-6461. Use Time#monotonicNow to compute duration in DataNode#shutDown.
(James Thomas via wang)
+ HDFS-6462. NFS: fsstat request fails with the secure hdfs (brandonli)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
