Author: szetszwo
Date: Thu Oct 25 18:58:35 2012
New Revision: 1402273
URL: http://svn.apache.org/viewvc?rev=1402273&view=rev
Log:
svn merge -c 1402270 from trunk for HDFS-3948. Do not use hflush in
TestWebHDFS.testNamenodeRestart() since the out stream returned by
WebHdfsFileSystem does not support it.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1402270
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1402273&r1=1402272&r2=1402273&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Oct 25 18:58:35 2012
@@ -150,6 +150,10 @@ Release 2.0.3-alpha - Unreleased
HDFS-4022. Replication not happening for appended block. (Vinay via
umamahesh)
+ HDFS-3948. Do not use hflush in TestWebHDFS.testNamenodeRestart() since the
+ out stream returned by WebHdfsFileSystem does not support it. (Jing Zhao
+ via szetszwo)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1402270
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java?rev=1402273&r1=1402272&r2=1402273&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
Thu Oct 25 18:58:35 2012
@@ -824,7 +824,14 @@ public class TestDFSClientRetries {
new Random().nextBytes(bytes);
out4.write(bytes);
out4.write(bytes);
- out4.hflush();
+ if (isWebHDFS) {
+ // WebHDFS does not support hflush. To avoid DataNode communicating
with
+ // NN while we're shutting down NN, we call out4.close() to finish
+ // writing the data
+ out4.close();
+ } else {
+ out4.hflush();
+ }
//shutdown namenode
assertTrue(HdfsUtils.isHealthy(uri));
@@ -837,10 +844,12 @@ public class TestDFSClientRetries {
public void run() {
try {
//write some more data and then close the file
- out4.write(bytes);
- out4.write(bytes);
- out4.write(bytes);
- out4.close();
+ if (!isWebHDFS) {
+ out4.write(bytes);
+ out4.write(bytes);
+ out4.write(bytes);
+ out4.close();
+ }
} catch (Exception e) {
exceptions.add(e);
}
@@ -923,7 +932,11 @@ public class TestDFSClientRetries {
Assert.assertEquals(String.format("count=%d", count),
bytes[count % bytes.length], (byte)r);
}
- Assert.assertEquals(5 * bytes.length, count);
+ if (!isWebHDFS) {
+ Assert.assertEquals(5 * bytes.length, count);
+ } else {
+ Assert.assertEquals(2 * bytes.length, count);
+ }
in.close();
}
