big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-18809. S3A prefetch read/write file operations should guard channel close (#5853)

Browse Source 
Contributed by Viraj Jasani
This commit is contained in:
Viraj Jasani 2023-07-18 07:16:12 -06:00 committed by GitHub
parent c44823dadb
commit 38ac2f7349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/prefetch/SingleFilePerBlockCache.java
View File

@ -271,12 +271,12 @@ public void get(int blockNumber, ByteBuffer buffer) throws IOException {
protected int readFile(Path path, ByteBuffer buffer) throws IOException {
int numBytesRead = 0;
int numBytes;
FileChannel channel = FileChannel.open(path, StandardOpenOption.READ);
while ((numBytes = channel.read(buffer)) > 0) {
numBytesRead += numBytes;
try (FileChannel channel = FileChannel.open(path, StandardOpenOption.READ)) {
while ((numBytes = channel.read(buffer)) > 0) {
numBytesRead += numBytes;
}
buffer.limit(buffer.position());
}
buffer.limit(buffer.position());
channel.close();
return numBytesRead;
}
@ -460,11 +460,11 @@ private void deleteBlockFileAndEvictCache(Entry elementToPurge) {
protected void writeFile(Path path, ByteBuffer buffer) throws IOException {
buffer.rewind();
WritableByteChannel writeChannel = Files.newByteChannel(path, CREATE_OPTIONS);
while (buffer.hasRemaining()) {
writeChannel.write(buffer);
try (WritableByteChannel writeChannel = Files.newByteChannel(path, CREATE_OPTIONS)) {
while (buffer.hasRemaining()) {
writeChannel.write(buffer);
}
}
writeChannel.close();
}
/**