You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by ki...@apache.org on 2013/04/04 16:05:36 UTC
svn commit: r1464556 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
Author: kihwal
Date: Thu Apr 4 14:05:36 2013
New Revision: 1464556
URL: http://svn.apache.org/r1464556
Log:
HDFS-4548. Webhdfs doesn't renegotiate SPNEGO token. Contributed by Daryn Sharp.
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1464556&r1=1464555&r2=1464556&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Apr 4 14:05:36 2013
@@ -92,6 +92,8 @@ Release 0.23.7 - UNRELEASED
HDFS-4649. Webhdfs cannot list large directories (daryn via kihwal)
+ HDFS-4548. Webhdfs doesn't renegotiate SPNEGO token (daryn via kihwal)
+
Release 0.23.6 - 2013-02-06
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java?rev=1464556&r1=1464555&r2=1464556&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java Thu Apr 4 14:05:36 2013
@@ -130,7 +130,6 @@ public class WebHdfsFileSystem extends F
private URI uri;
private boolean hasInitedToken;
private Token<?> delegationToken;
- private final AuthenticatedURL.Token authToken = new AuthenticatedURL.Token();
private Path workingDir;
@Override
@@ -360,6 +359,8 @@ public class WebHdfsFileSystem extends F
try {
if (requireAuth) {
LOG.debug("open AuthenticatedURL connection");
+ UserGroupInformation.getCurrentUser().checkTGTAndReloginFromKeytab();
+ final AuthenticatedURL.Token authToken = new AuthenticatedURL.Token();
conn = new AuthenticatedURL(AUTH).openConnection(url, authToken);
} else {
LOG.debug("open URL connection");
@@ -828,20 +829,12 @@ public class WebHdfsFileSystem extends F
@Override
public long renew(final Token<?> token, final Configuration conf
) throws IOException, InterruptedException {
- final UserGroupInformation ugi = UserGroupInformation.getLoginUser();
- // update the kerberos credentials, if they are coming from a keytab
- ugi.reloginFromKeytab();
-
return getWebHdfs(token, conf).renewDelegationToken(token);
}
@Override
public void cancel(final Token<?> token, final Configuration conf
) throws IOException, InterruptedException {
- final UserGroupInformation ugi = UserGroupInformation.getLoginUser();
- // update the kerberos credentials, if they are coming from a keytab
- ugi.checkTGTAndReloginFromKeytab();
-
getWebHdfs(token, conf).cancelDelegationToken(token);
}
}