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

HDFS-14048. DFSOutputStream close() throws exception on subsequent call after DataNode restart. Contributed by Erik Krogen.

Browse Source
This commit is contained in:
Inigo Goiri 2018-11-06 12:16:46 -08:00
parent 98075d9224
commit d9b3b58389
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
View File

@ -290,7 +290,7 @@ private static void releaseBuffer(List<DFSPacket> packets, ByteArrayManager bam)
}
packets.clear();
}
static class LastExceptionInStreamer {
private IOException thrown;
@ -1754,6 +1754,7 @@ private boolean createBlockOutputStream(DatanodeInfo[] nodes,
blockStream = out;
result = true; // success
errorState.reset();
lastException.clear();
// remove all restarting nodes from failed nodes list
failed.removeAll(restartingNodes);
restartingNodes.clear();
@ -1835,7 +1836,7 @@ private boolean[] getPinnings(DatanodeInfo[] nodes) {
protected LocatedBlock locateFollowingBlock(DatanodeInfo[] excluded,
ExtendedBlock oldBlock) throws IOException {
final DfsClientConf conf = dfsClient.getConf();
final DfsClientConf conf = dfsClient.getConf();
int retries = conf.getNumBlockWriteLocateFollowingRetry();
long sleeptime = conf.getBlockWriteLocateFollowingInitialDelayMs();
while (true) {

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java
View File

@ -436,6 +436,8 @@ public Boolean get() {
0, out.getStreamer().getPipelineRecoveryCount());
out.write(1);
out.close();
// Ensure that subsequent closes are idempotent and do not throw errors
out.close();
} finally {
if (cluster != null) {
cluster.shutdown();