Author: todd
Date: Fri Aug 26 06:51:57 2011
New Revision: 1162005
URL: http://svn.apache.org/viewvc?rev=1162005&view=rev
Log:
HDFS-2287. TestParallelRead has a small off-by-one bug. Contributed by Todd
Lipcon.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.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=1162005&r1=1162004&r2=1162005&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Aug 26
06:51:57 2011
@@ -5,6 +5,9 @@ Trunk (unreleased changes)
HDFS-395. DFS Scalability: Incremental block reports. (Tomasz Nykiel
via hairong)
+ BUG FIXES
+ HDFS-2287. TestParallelRead has a small off-by-one bug. (todd)
+
Release 0.23.0 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java?rev=1162005&r1=1162004&r2=1162005&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestParallelRead.java
Fri Aug 26 06:51:57 2011
@@ -109,11 +109,11 @@ public class TestParallelRead {
pRead(startOff, len);
bytesRead += len;
}
- } catch (Exception ex) {
+ } catch (Throwable t) {
LOG.error(getName() + ": Error while testing read at " + startOff +
" length " + len);
error = true;
- fail(ex.getMessage());
+ fail(t.getMessage());
}
}
}
@@ -135,8 +135,8 @@ public class TestParallelRead {
*/
private void read(int start, int len) throws Exception {
assertTrue(
- "Bad args: " + start + " + " + len + " should be < " + fileSize,
- start + len < fileSize);
+ "Bad args: " + start + " + " + len + " should be <= " + fileSize,
+ start + len <= fileSize);
DFSInputStream dis = testInfo.dis;
synchronized (dis) {
