Skip to content

Close DFSInputStream on exception in CachableBlockFile.getBCFile #6377

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

Merged
dlmarion merged 3 commits into from
May 28, 2026
+26 −18
Merged

Close DFSInputStream on exception in CachableBlockFile.getBCFile #6377

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83535ef
Close DFSInputStream on exception in CachableBlockFile.getBCFile
dlmarion May 18, 2026
32a17be
use single try-catch around all BCFile.Reader constructors
dlmarion May 19, 2026
dd8515c
Catch error coming from supplier
dlmarion May 19, 2026
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
42 changes: 25 additions & 17 deletions core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,25 +187,33 @@ private BCFile.Reader getBCFile(Supplier<byte[]> cachedMetadataSupplier) throws
new RateLimitedInputStream((InputStream & Seekable) inputSupplier.get(), readLimiter);
BCFile.Reader tmpReader = null;
byte[] serializedMetadata = cachedMetadataSupplier.get();
Copy link
Copy Markdown
Member

@DomGarguilo DomGarguilo May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If cachedMetadataSupplier.get() can throw, that should probably be moved into the try block too. Otherwise this PR LGTM

Copy link
Copy Markdown
Contributor Author

@dlmarion dlmarion May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I captured that line in the try block in dd8515c

if (serializedMetadata == null) {
if (fileLenCache == null) {
tmpReader = new BCFile.Reader(fsIn, lengthSupplier.get(), conf, cryptoService);
} else {
long len = getCachedFileLen();
try {
tmpReader = new BCFile.Reader(fsIn, len, conf, cryptoService);
} catch (Exception e) {
log.debug("Failed to open {}, clearing file length cache and retrying", cacheId, e);
fileLenCache.invalidate(cacheId);
}

if (tmpReader == null) {
len = getCachedFileLen();
tmpReader = new BCFile.Reader(fsIn, len, conf, cryptoService);
try {
if (serializedMetadata == null) {
if (fileLenCache == null) {
tmpReader = new BCFile.Reader(fsIn, lengthSupplier.get(), conf, cryptoService);
} else {
long len = getCachedFileLen();
try {
tmpReader = new BCFile.Reader(fsIn, len, conf, cryptoService);
} catch (Exception e) {
log.debug("Failed to open {}, clearing file length cache and retrying", cacheId, e);
fileLenCache.invalidate(cacheId);
}

if (tmpReader == null) {
len = getCachedFileLen();
tmpReader = new BCFile.Reader(fsIn, len, conf, cryptoService);
}
}
} else {
tmpReader = new BCFile.Reader(serializedMetadata, fsIn, conf, cryptoService);
}
} else {
tmpReader = new BCFile.Reader(serializedMetadata, fsIn, conf, cryptoService);
} catch (IOException | RuntimeException e) {
fsIn.close();
if (fileLenCache != null) {
fileLenCache.invalidate(cacheId);
}
throw e;
}

if (bcfr.compareAndSet(null, tmpReader)) {
Expand Down