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 su...@apache.org on 2011/09/28 01:16:18 UTC
svn commit: r1176654 - in
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java
Author: suresh
Date: Tue Sep 27 23:16:17 2011
New Revision: 1176654
URL: http://svn.apache.org/viewvc?rev=1176654&view=rev
Log:
HDFS-2373. Commands using webhdfs and hftp print unnecessary debug info on the console with security enabled. Contributed by Arpit Gupta.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java
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=1176654&r1=1176653&r2=1176654&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Sep 27 23:16:17 2011
@@ -72,6 +72,9 @@ Trunk (unreleased changes)
HDFS-2366. Initialize WebHdfsFileSystem.ugi in object construction.
(szetszwo)
+ HDFS-2373. Commands using webhdfs and hftp print unnecessary debug
+ info on the console with security enabled. (Arpit Gupta via suresh)
+
Release 0.23.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java?rev=1176654&r1=1176653&r2=1176654&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java Tue Sep 27 23:16:17 2011
@@ -149,7 +149,9 @@ public class DelegationTokenFetcher {
DataInputStream in = new DataInputStream(
new ByteArrayInputStream(token.getIdentifier()));
id.readFields(in);
- System.out.println("Token (" + id + ") for " + token.getService());
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Token (" + id + ") for " + token.getService());
+ }
}
return null;
}
@@ -160,22 +162,28 @@ public class DelegationTokenFetcher {
for (Token<?> token : readTokens(tokenFile, conf)) {
result = renewDelegationToken(webUrl,
(Token<DelegationTokenIdentifier>) token);
- System.out.println("Renewed token via " + webUrl + " for "
- + token.getService() + " until: " + new Date(result));
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Renewed token via " + webUrl + " for "
+ + token.getService() + " until: " + new Date(result));
+ }
}
} else if (cancel) {
for (Token<?> token : readTokens(tokenFile, conf)) {
cancelDelegationToken(webUrl,
(Token<DelegationTokenIdentifier>) token);
- System.out.println("Cancelled token via " + webUrl + " for "
- + token.getService());
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Cancelled token via " + webUrl + " for "
+ + token.getService());
+ }
}
} else {
Credentials creds = getDTfromRemote(webUrl, renewer);
creds.writeTokenStorageFile(tokenFile, conf);
for (Token<?> token : creds.getAllTokens()) {
- System.out.println("Fetched token via " + webUrl + " for "
- + token.getService() + " into " + tokenFile);
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Fetched token via " + webUrl + " for "
+ + token.getService() + " into " + tokenFile);
+ }
}
}
} else {
@@ -184,24 +192,30 @@ public class DelegationTokenFetcher {
for (Token<?> token : readTokens(tokenFile, conf)) {
((DistributedFileSystem) fs)
.cancelDelegationToken((Token<DelegationTokenIdentifier>) token);
- System.out.println("Cancelled token for "
- + token.getService());
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Cancelled token for "
+ + token.getService());
+ }
}
} else if (renew) {
long result;
for (Token<?> token : readTokens(tokenFile, conf)) {
result = ((DistributedFileSystem) fs)
.renewDelegationToken((Token<DelegationTokenIdentifier>) token);
- System.out.println("Renewed token for " + token.getService()
- + " until: " + new Date(result));
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Renewed token for " + token.getService()
+ + " until: " + new Date(result));
+ }
}
} else {
Token<?> token = fs.getDelegationToken(renewer);
Credentials cred = new Credentials();
cred.addToken(token.getService(), token);
cred.writeTokenStorageFile(tokenFile, conf);
- System.out.println("Fetched token for " + token.getService()
- + " into " + tokenFile);
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Fetched token for " + token.getService()
+ + " into " + tokenFile);
+ }
}
}
return null;
@@ -221,6 +235,11 @@ public class DelegationTokenFetcher {
} else {
url.append(nnAddr).append(GetDelegationTokenServlet.PATH_SPEC);
}
+
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Retrieving token from: " + url);
+ }
+
URL remoteURL = new URL(url.toString());
SecurityUtil.fetchServiceTicket(remoteURL);
URLConnection connection = remoteURL.openConnection();