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 sz...@apache.org on 2012/07/26 01:52:26 UTC
svn commit: r1365846 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs: ./
CHANGES.txt src/main/java/
src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
Author: szetszwo
Date: Wed Jul 25 23:52:25 2012
New Revision: 1365846
URL: http://svn.apache.org/viewvc?rev=1365846&view=rev
Log:
svn merge -c -1365843 for reverting HDFS-3696 since the test cannot be compiled.
Removed:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/ (props changed)
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/ (props changed)
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
Propchange: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Reverse-merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1365839
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=1365846&r1=1365845&r2=1365846&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 Wed Jul 25 23:52:25 2012
@@ -81,9 +81,6 @@ Release 0.23.3 - UNRELEASED
HDFS-3688. Namenode loses datanode hostname if datanode re-registers
(Jason Lowe via daryn)
- HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations
- to get around a Java library bug causing OutOfMemoryError. (szetszwo)
-
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Reverse-merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1365839
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=1365846&r1=1365845&r2=1365846&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 Wed Jul 25 23:52:25 2012
@@ -412,7 +412,6 @@ public class WebHdfsFileSystem extends F
//Step 2) Submit another Http request with the URL from the Location header with data.
conn = (HttpURLConnection)new URL(redirect).openConnection();
conn.setRequestMethod(op.getType().toString());
- conn.setChunkedStreamingMode(32 << 10); //32kB-chunk
return conn;
}
@@ -825,7 +824,8 @@ public class WebHdfsFileSystem extends F
}
private static WebHdfsFileSystem getWebHdfs(
- final Token<?> token, final Configuration conf) throws IOException {
+ final Token<?> token, final Configuration conf
+ ) throws IOException, InterruptedException, URISyntaxException {
final InetSocketAddress nnAddr = SecurityUtil.getTokenServiceAddr(token);
final URI uri = DFSUtil.createUri(WebHdfsFileSystem.SCHEME, nnAddr);
@@ -839,7 +839,12 @@ public class WebHdfsFileSystem extends F
// update the kerberos credentials, if they are coming from a keytab
ugi.reloginFromKeytab();
- return getWebHdfs(token, conf).renewDelegationToken(token);
+ try {
+ WebHdfsFileSystem webhdfs = getWebHdfs(token, conf);
+ return webhdfs.renewDelegationToken(token);
+ } catch (URISyntaxException e) {
+ throw new IOException(e);
+ }
}
@Override
@@ -849,7 +854,12 @@ public class WebHdfsFileSystem extends F
// update the kerberos credentials, if they are coming from a keytab
ugi.checkTGTAndReloginFromKeytab();
- getWebHdfs(token, conf).cancelDelegationToken(token);
+ try {
+ final WebHdfsFileSystem webhdfs = getWebHdfs(token, conf);
+ webhdfs.cancelDelegationToken(token);
+ } catch (URISyntaxException e) {
+ throw new IOException(e);
+ }
}
}