Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged r1240460 from trunk for HDFS-2785. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240461 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jitendra Nath Pandey 2012-02-04 07:02:30 +00:00
parent b6bcde5ce9
commit d511d704d2
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -104,6 +104,9 @@ Release 0.23.1 - UNRELEASED
HDFS-2784. Update hftp and hdfs for host-based token support. HDFS-2784. Update hftp and hdfs for host-based token support.
(Kihwal Lee via jitendra) (Kihwal Lee via jitendra)
HDFS-2785. Update webhdfs and httpfs for host-based token support.
(Robert Joseph Evans via jitendra)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-2130. Switch default checksum to CRC32C. (todd) HDFS-2130. Switch default checksum to CRC32C. (todd)

19
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
View File

@ -141,6 +141,7 @@ public class WebHdfsFileSystem extends FileSystem
private final UserGroupInformation ugi; private final UserGroupInformation ugi;
private InetSocketAddress nnAddr; private InetSocketAddress nnAddr;
private URI uri;
private Token<?> delegationToken; private Token<?> delegationToken;
private final AuthenticatedURL.Token authToken = new AuthenticatedURL.Token(); private final AuthenticatedURL.Token authToken = new AuthenticatedURL.Token();
private Path workingDir; private Path workingDir;
@ -158,7 +159,11 @@ public class WebHdfsFileSystem extends FileSystem
) throws IOException { ) throws IOException {
super.initialize(uri, conf); super.initialize(uri, conf);
setConf(conf); setConf(conf);
try {
this.uri = new URI(uri.getScheme(), uri.getAuthority(), null, null, null);
} catch (URISyntaxException e) {
throw new IllegalArgumentException(e);
}
this.nnAddr = NetUtils.createSocketAddr(uri.toString()); this.nnAddr = NetUtils.createSocketAddr(uri.toString());
this.workingDir = getHomeDirectory(); this.workingDir = getHomeDirectory();
@ -203,12 +208,7 @@ public class WebHdfsFileSystem extends FileSystem
@Override @Override
public URI getUri() { public URI getUri() {
try { return this.uri;
return new URI(SCHEME, null, nnAddr.getHostName(), nnAddr.getPort(),
null, null, null);
} catch (URISyntaxException e) {
return null;
}
} }
/** @return the home directory. */ /** @return the home directory. */
@ -810,8 +810,7 @@ public class WebHdfsFileSystem extends FileSystem
final Token<?> token, final Configuration conf final Token<?> token, final Configuration conf
) throws IOException, InterruptedException, URISyntaxException { ) throws IOException, InterruptedException, URISyntaxException {
final InetSocketAddress nnAddr = NetUtils.createSocketAddr( final InetSocketAddress nnAddr = SecurityUtil.getTokenServiceAddr(token);
token.getService().toString());
final URI uri = DFSUtil.createUri(WebHdfsFileSystem.SCHEME, nnAddr); final URI uri = DFSUtil.createUri(WebHdfsFileSystem.SCHEME, nnAddr);
return (WebHdfsFileSystem)FileSystem.get(uri, conf); return (WebHdfsFileSystem)FileSystem.get(uri, conf);
} }
@ -821,7 +820,7 @@ public class WebHdfsFileSystem extends FileSystem
) throws IOException, InterruptedException { ) throws IOException, InterruptedException {
final UserGroupInformation ugi = UserGroupInformation.getLoginUser(); final UserGroupInformation ugi = UserGroupInformation.getLoginUser();
// update the kerberos credentials, if they are coming from a keytab // update the kerberos credentials, if they are coming from a keytab
ugi.checkTGTAndReloginFromKeytab(); ugi.reloginFromKeytab();
try { try {
WebHdfsFileSystem webhdfs = getWebHdfs(token, conf); WebHdfsFileSystem webhdfs = getWebHdfs(token, conf);