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 dd...@apache.org on 2010/07/09 22:11:35 UTC
svn commit: r962678 - in /hadoop/hdfs/trunk: ./
src/java/org/apache/hadoop/hdfs/server/namenode/
src/java/org/apache/hadoop/hdfs/tools/ src/test/hdfs/org/apache/hadoop/tools/
Author: ddas
Date: Fri Jul 9 20:11:34 2010
New Revision: 962678
URL: http://svn.apache.org/viewvc?rev=962678&view=rev
Log:
HDFS-1272. Fixes to take care of the changes in HADOOP-6845. Contributed by Jitendra Pandey.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DelegationTokenServlet.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/tools/TestDelegationTokenFetcher.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=962678&r1=962677&r2=962678&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Jul 9 20:11:34 2010
@@ -67,6 +67,9 @@ Trunk (unreleased changes)
HDFS-947. An Hftp read request is redirected to a datanode that has
the most replicas of the blocks in the file. (Dmytro Molkov via dhruba)
+ HDFS-1272. Fixes to take care of the changes in HADOOP-6845.
+ (Jitendra Pandey via ddas)
+
OPTIMIZATIONS
HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DelegationTokenServlet.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DelegationTokenServlet.java?rev=962678&r1=962677&r2=962678&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DelegationTokenServlet.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/DelegationTokenServlet.java Fri Jul 9 20:11:34 2010
@@ -31,7 +31,7 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.security.TokenStorage;
+import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
@@ -74,7 +74,7 @@ public class DelegationTokenServlet exte
String s = nn.rpcAddress.getAddress().getHostAddress()
+ ":" + nn.rpcAddress.getPort();
token.setService(new Text(s));
- TokenStorage ts = new TokenStorage();
+ Credentials ts = new Credentials();
ts.addToken(new Text(ugi.getShortUserName()), token);
ts.write(dosFinal);
dosFinal.close();
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java?rev=962678&r1=962677&r2=962678&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java Fri Jul 9 20:11:34 2010
@@ -37,7 +37,7 @@ import org.apache.hadoop.hdfs.security.t
import org.apache.hadoop.hdfs.server.namenode.DelegationTokenServlet;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.security.SecurityUtil;
-import org.apache.hadoop.security.TokenStorage;
+import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.StringUtils;
@@ -130,7 +130,7 @@ public class DelegationTokenFetcher {
InetAddress.getByName(uri.getHost()).getHostAddress() + ":" + uri.getPort();
token.setService(new Text(nnAddress));
- TokenStorage ts = new TokenStorage();
+ Credentials ts = new Credentials();
ts.addToken(new Text(shortName), token);
ts.write(out);
}
@@ -159,7 +159,7 @@ public class DelegationTokenFetcher {
URLConnection connection = remoteURL.openConnection();
InputStream in = connection.getInputStream();
- TokenStorage ts = new TokenStorage();
+ Credentials ts = new Credentials();
dis = new DataInputStream(in);
ts.readFields(dis);
file = new DataOutputStream(new FileOutputStream(filename));
Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/tools/TestDelegationTokenFetcher.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/tools/TestDelegationTokenFetcher.java?rev=962678&r1=962677&r2=962678&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/tools/TestDelegationTokenFetcher.java (original)
+++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/tools/TestDelegationTokenFetcher.java Fri Jul 9 20:11:34 2010
@@ -34,7 +34,7 @@ import org.apache.hadoop.hdfs.Distribute
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
import org.apache.hadoop.hdfs.tools.DelegationTokenFetcher;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.security.TokenStorage;
+import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
@@ -82,7 +82,7 @@ public class TestDelegationTokenFetcher
new DelegationTokenFetcher(dfs, out, ugi, conf).go();
// now read the data back in and verify correct values
- TokenStorage ts = new TokenStorage();
+ Credentials ts = new Credentials();
DataInputStream dis =
new DataInputStream(new ByteArrayInputStream(baos.toByteArray()));
ts.readFields(dis);