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

HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574205 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2014-03-04 21:07:03 +00:00
parent 88245b6a41
commit c0a903da22
2 changed files with 8 additions and 2 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

@ -525,6 +525,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6040. fix DFSClient issue without libhadoop.so and some other HDFS-6040. fix DFSClient issue without libhadoop.so and some other
ShortCircuitShm cleanups (cmccabe) ShortCircuitShm cleanups (cmccabe)
HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange
(stack)
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

7
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
View File

@ -1177,8 +1177,11 @@ implements ByteBufferReadable, CanSetDropBehind, CanSetReadahead,
// exception already handled in the call method. getFirstToComplete // exception already handled in the call method. getFirstToComplete
// will remove the failing future from the list. nothing more to do. // will remove the failing future from the list. nothing more to do.
} }
// We got here if exception. Ignore this node on next go around. // We got here if exception. Ignore this node on next go around IFF
ignored.add(chosenNode.info); // we found a chosenNode to hedge read against.
if (chosenNode != null && chosenNode.info != null) {
ignored.add(chosenNode.info);
}
} }
// executed if we get an error from a data node // executed if we get an error from a data node
block = getBlockAt(block.getStartOffset(), false); block = getBlockAt(block.getStartOffset(), false);