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

HDFS-3707. TestFSInputChecker: improper use of skip. Contributed by Colin Patrick McCabe 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375338 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-08-21 00:01:43 +00:00
parent c2a3da8fce
commit 566f3d5917
2 changed files with 29 additions and 6 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

@ -479,6 +479,9 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3816. Invalidate work percentage default value should be 0.32f HDFS-3816. Invalidate work percentage default value should be 0.32f
instead of 32. (Jing Zhao via suresh) instead of 32. (Jing Zhao via suresh)
HDFS-3707. TestFSInputChecker: improper use of skip.
(Colin Patrick McCabe via eli)
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)

32
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFSInputChecker.java
View File

@ -20,7 +20,9 @@ package org.apache.hadoop.hdfs;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.EOFException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -159,8 +161,8 @@ public class TestFSInputChecker {
private void testSkip1(int skippedBytes) private void testSkip1(int skippedBytes)
throws Exception { throws Exception {
long oldPos = stm.getPos(); long oldPos = stm.getPos();
long nSkipped = stm.skip(skippedBytes); IOUtils.skipFully(stm, skippedBytes);
long newPos = oldPos+nSkipped; long newPos = oldPos + skippedBytes;
assertEquals(stm.getPos(), newPos); assertEquals(stm.getPos(), newPos);
stm.readFully(actual); stm.readFully(actual);
checkAndEraseData(actual, (int)newPos, expected, "Read Sanity Test"); checkAndEraseData(actual, (int)newPos, expected, "Read Sanity Test");
@ -193,13 +195,31 @@ public class TestFSInputChecker {
testSkip1(FILE_SIZE-1); testSkip1(FILE_SIZE-1);
stm.seek(0); stm.seek(0);
assertEquals(stm.skip(FILE_SIZE), FILE_SIZE); IOUtils.skipFully(stm, FILE_SIZE);
assertEquals(stm.skip(10), 0); try {
IOUtils.skipFully(stm, 10);
fail("expected to get a PrematureEOFException");
} catch (EOFException e) {
assertEquals(e.getMessage(), "Premature EOF from inputStream " +
"after skipping 0 byte(s).");
}
stm.seek(0); stm.seek(0);
assertEquals(stm.skip(FILE_SIZE+10), FILE_SIZE); try {
IOUtils.skipFully(stm, FILE_SIZE + 10);
fail("expected to get a PrematureEOFException");
} catch (EOFException e) {
assertEquals(e.getMessage(), "Premature EOF from inputStream " +
"after skipping " + FILE_SIZE + " byte(s).");
}
stm.seek(10); stm.seek(10);
assertEquals(stm.skip(FILE_SIZE), FILE_SIZE-10); try {
IOUtils.skipFully(stm, FILE_SIZE);
fail("expected to get a PrematureEOFException");
} catch (EOFException e) {
assertEquals(e.getMessage(), "Premature EOF from inputStream " +
"after skipping " + (FILE_SIZE - 10) + " byte(s).");
}
} }
private void cleanupFile(FileSystem fileSys, Path name) throws IOException { private void cleanupFile(FileSystem fileSys, Path name) throws IOException {