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

HDFS-8183. Erasure Coding: Improve DFSStripedOutputStream closing of datastreamer threads. Contributed by Rakesh R.

This commit is contained in:
Zhe Zhang 2015-04-30 00:13:32 -07:00 committed by Zhe Zhang
parent f0628280c3
commit 1a31f1c303
2 changed files with 13 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-HDFS-EC-7285.txt
View File

@ -149,3 +149,6 @@
HDFS-8282. Erasure coding: move striped reading logic to StripedBlockUtil. HDFS-8282. Erasure coding: move striped reading logic to StripedBlockUtil.
(Zhe Zhang) (Zhe Zhang)
HDFS-8183. Erasure Coding: Improve DFSStripedOutputStream closing of
datastreamer threads. (Rakesh R via Zhe Zhang)

12
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
View File

@ -331,18 +331,26 @@ public class DFSStripedOutputStream extends DFSOutputStream {
// interrupt datastreamer if force is true // interrupt datastreamer if force is true
@Override @Override
protected void closeThreads(boolean force) throws IOException { protected void closeThreads(boolean force) throws IOException {
int index = 0;
boolean exceptionOccurred = false;
for (StripedDataStreamer streamer : streamers) { for (StripedDataStreamer streamer : streamers) {
try { try {
streamer.close(force); streamer.close(force);
streamer.join(); streamer.join();
streamer.closeSocket(); streamer.closeSocket();
} catch (InterruptedException e) { } catch (InterruptedException | IOException e) {
throw new IOException("Failed to shutdown streamer"); DFSClient.LOG.error("Failed to shutdown streamer: name="
+ streamer.getName() + ", index=" + index + ", file=" + src, e);
exceptionOccurred = true;
} finally { } finally {
streamer.setSocketToNull(); streamer.setSocketToNull();
setClosed(); setClosed();
index++;
} }
} }
if (exceptionOccurred) {
throw new IOException("Failed to shutdown streamer");
}
} }
/** /**