Skip to content

HDFS-17893. Close block readers in DFSStripedInputStream on EC read exception #8348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlmarion wants to merge 1 commit into
base: trunk
Choose a base branch
from
+4 −4
Open

HDFS-17893. Close block readers in DFSStripedInputStream on EC read exception #8348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...op-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private void readDataForDecoding() throws IOException {
checkMissingBlocks();
}

void readParityChunks(int num) throws IOException {
private void readParityChunks(int num) throws IOException {
for (int i = dataBlkNum, j = 0; i < dataBlkNum + parityBlkNum && j < num;
i++) {
if (alignedStripe.chunks[i] == null) {
Expand Down Expand Up @@ -298,7 +298,7 @@ private Callable<BlockReadStats> readCells(final BlockReader reader,
};
}

boolean readChunk(final LocatedBlock block, int chunkIndex)
private boolean readChunk(final LocatedBlock block, int chunkIndex)
throws IOException {
final StripingChunk chunk = alignedStripe.chunks[chunkIndex];
if (block == null) {
Expand Down Expand Up @@ -353,7 +353,7 @@ void readStripe() throws IOException {
readParityChunks(alignedStripe.missingChunksNum);
}
} catch (IOException e) {
dfsStripedInputStream.close();
dfsStripedInputStream.closeCurrentBlockReaders();
throw e;
}
// TODO: for a full stripe we can start reading (dataBlkNum + 1) chunks
Expand Down Expand Up @@ -397,7 +397,7 @@ void readStripe() throws IOException {
} catch (InterruptedException ie) {
String err = "Read request interrupted";
DFSClient.LOG.error(err, ie);
dfsStripedInputStream.close();
dfsStripedInputStream.closeCurrentBlockReaders();
clearFutures();
// Don't decode if read interrupted
throw new InterruptedIOException(err);
Expand Down
Loading