HDFS-6462. NFS: fsstat request fails with the secure hdfs. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598405 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1d5e564998
commit
c55947343e
@ -44,7 +44,6 @@
|
||||
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 RpcProgram implements Nfs3Interface {
|
||||
|
||||
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 RpcProgramNfs3(Configuration config, DatagramSocket registrationSocket,
|
||||
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 FSSTAT3Response fsstat(XDR xdr, SecurityHandler securityHandler,
|
||||
}
|
||||
|
||||
try {
|
||||
// Use superUserClient to get file system status
|
||||
FsStatus fsStatus = superUserClient.getDiskStatus();
|
||||
FsStatus fsStatus = dfsClient.getDiskStatus();
|
||||
long totalBytes = fsStatus.getCapacity();
|
||||
long freeBytes = fsStatus.getRemaining();
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user