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

Merge -r 1368732:1368733 from trunk to branch. FIXES: HDFS-3756 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368735 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-08-02 22:12:58 +00:00
parent f7545f076e
commit 99050a6508
2 changed files with 3 additions and 1 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

@ -397,6 +397,9 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3738. TestDFSClientRetries#testFailuresArePerOperation sets incorrect HDFS-3738. TestDFSClientRetries#testFailuresArePerOperation sets incorrect
timeout config. (atm) timeout config. (atm)
HDFS-3756. DelegationTokenFetcher creates 2 HTTP connections, the second
one not properly configured. (tucu)
BREAKDOWN OF HDFS-3042 SUBTASKS BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd) HDFS-2185. HDFS portion of ZK-based FailoverController (todd)

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DelegationTokenFetcher.java
View File

@ -251,7 +251,6 @@ public class DelegationTokenFetcher {
try { try {
URL url = new URL(buf.toString()); URL url = new URL(buf.toString());
connection = (HttpURLConnection) SecurityUtil.openSecureHttpConnection(url); connection = (HttpURLConnection) SecurityUtil.openSecureHttpConnection(url);
connection = (HttpURLConnection)URLUtils.openConnection(url);
if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) { if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
throw new IOException("Error renewing token: " + throw new IOException("Error renewing token: " +
connection.getResponseMessage()); connection.getResponseMessage());