Skip to content

Commit 45aa5ae

Browse files
Tidy up some more of SharedBlobCacheService (elastic#97867)
With the removal of some ref counting that one ensureOpen became redunndant. Also, no need to keep a reference to the channel now that it doesn't hold any state.
1 parent ea42c2e commit 45aa5ae

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

x-pack/plugin/blob-cache/src/main/java/org/elasticsearch/blobcache/shared/SharedBlobCacheService.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -801,21 +801,17 @@ void populateAndRead(
801801
assert rangeToRead.length() > 0;
802802
Releasable resource = null;
803803
try {
804-
ensureOpen();
805804
incRef();
806805
resource = Releasables.releaseOnce(this::decRef);
807-
808806
ensureOpen();
809-
final SharedBytes.IO fileChannel = sharedBytes.getFileChannel(sharedBytesPos);
810-
811807
final List<SparseFileTracker.Gap> gaps = tracker.waitForRange(
812808
rangeToWrite,
813809
rangeToRead,
814810
ActionListener.runBefore(listener, resource::close).delegateFailureAndWrap((l, success) -> {
815811
final long physicalStartOffset = physicalStartOffset();
816812
assert regionOwners.get(sharedBytesPos) == this;
817813
final int read = reader.onRangeAvailable(
818-
fileChannel,
814+
sharedBytes.getFileChannel(sharedBytesPos),
819815
physicalStartOffset + rangeToRead.start(),
820816
rangeToRead.start(),
821817
rangeToRead.length()
@@ -834,14 +830,15 @@ void populateAndRead(
834830
);
835831

836832
if (gaps.isEmpty() == false) {
837-
fillGaps(writer, fileChannel, gaps);
833+
fillGaps(writer, gaps);
838834
}
839835
} catch (Exception e) {
840836
releaseAndFail(listener, resource, e);
841837
}
842838
}
843839

844-
private void fillGaps(RangeMissingHandler writer, SharedBytes.IO fileChannel, List<SparseFileTracker.Gap> gaps) {
840+
private void fillGaps(RangeMissingHandler writer, List<SparseFileTracker.Gap> gaps) {
841+
SharedBytes.IO fileChannel = sharedBytes.getFileChannel(sharedBytesPos);
845842
for (SparseFileTracker.Gap gap : gaps) {
846843
ioExecutor.execute(new AbstractRunnable() {
847844

0 commit comments

Comments
 (0)