Skip to content

[Backport] wire lazyLoadOnStart back up to segment loader config #18673

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

Closed
cecemei wants to merge 1 commit into from
Closed

[Backport] wire lazyLoadOnStart back up to segment loader config #18673

Show file tree
Hide file tree
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
20 changes: 13 additions & 7 deletions server/src/main/java/org/apache/druid/segment/loading/SegmentLocalCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,9 +639,11 @@ private SegmentCacheEntry assignLocationAndMount(
if (cacheEntry.checkExists(location.getPath())) {
if (location.isReserved(cacheEntry.id) || location.reserve(cacheEntry)) {
final SegmentCacheEntry entry = location.getCacheEntry(cacheEntry.id);
entry.lazyLoadCallback = segmentLoadFailCallback;
entry.mount(location);
return entry;
if (entry != null) {
entry.lazyLoadCallback = segmentLoadFailCallback;
entry.mount(location);
return entry;
}
} else {
// entry is not reserved, clean it up
deleteCacheEntryDirectory(cacheEntry.toPotentialLocation(location.getPath()));
Expand All @@ -658,9 +660,11 @@ private SegmentCacheEntry assignLocationAndMount(
if (location.reserve(cacheEntry)) {
try {
final SegmentCacheEntry entry = location.getCacheEntry(cacheEntry.id);
entry.lazyLoadCallback = segmentLoadFailCallback;
entry.mount(location);
return entry;
if (entry != null) {
entry.lazyLoadCallback = segmentLoadFailCallback;
entry.mount(location);
return entry;
}
}
catch (SegmentLoadingException e) {
log.warn(e, "Failed to load segment[%s] in location[%s], trying next location", cacheEntry.id, location.getPath());
Expand Down Expand Up @@ -831,7 +835,9 @@ public void mount(StorageLocation mountLocation) throws SegmentLoadingException
}
final SegmentizerFactory factory = getSegmentFactory(storageDir);

final Segment segment = factory.factorize(dataSegment, storageDir, false, lazyLoadCallback);
@SuppressWarnings("ObjectEquality")
final boolean lazy = config.isLazyLoadOnStart() && lazyLoadCallback != SegmentLazyLoadFailCallback.NOOP;
final Segment segment = factory.factorize(dataSegment, storageDir, lazy, lazyLoadCallback);
// wipe load callback after calling
lazyLoadCallback = SegmentLazyLoadFailCallback.NOOP;
referenceProvider = ReferenceCountedSegmentProvider.of(segment);
Expand Down
32 changes: 19 additions & 13 deletions server/src/main/java/org/apache/druid/server/ServerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,21 +308,27 @@ private ArrayList<SegmentReference> getSegmentReferences(
final ListenableFuture<ReferenceCountedObjectProvider<Segment>> future = futures.get(i);
final ReferenceCountedObjectProvider<Segment> referenceProvider =
future.get(timeoutAt - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
final Optional<Segment> segment = referenceProvider.acquireReference();
try {
final Optional<Segment> mappedSegment = segmentMapFunction.apply(segment).map(safetyNet::register);
if (referenceProvider == null) {
segmentReferences.add(
new SegmentReference(
segmentAndDescriptor.getDescriptor(),
mappedSegment,
action
)
new SegmentReference(segmentAndDescriptor.getDescriptor(), Optional.empty(), action)
);
}
catch (Throwable t) {
// if applying the mapFn failed, attach the base segment to the closer and rethrow
segment.ifPresent(safetyNet::register);
throw t;
} else {
final Optional<Segment> segment = referenceProvider.acquireReference();
try {
final Optional<Segment> mappedSegment = segmentMapFunction.apply(segment).map(safetyNet::register);
segmentReferences.add(
new SegmentReference(
segmentAndDescriptor.getDescriptor(),
mappedSegment,
action
)
);
}
catch (Throwable t) {
// if applying the mapFn failed, attach the base segment to the closer and rethrow
segment.ifPresent(safetyNet::register);
throw t;
}
}
}
catch (Throwable t) {
Expand Down
37 changes: 37 additions & 0 deletions server/src/test/java/org/apache/druid/segment/loading/SegmentLocalCacheManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,43 @@ public void testGetBootstrapSegment() throws SegmentLoadingException
Assert.assertEquals(dataSegment.getInterval(), actualBootstrapSegment.getDataInterval());
}


@Test
public void testGetBootstrapSegmentLazy() throws SegmentLoadingException
{
final StorageLocationConfig locationConfig = new StorageLocationConfig(localSegmentCacheDir, 10000L, null);
final SegmentLoaderConfig loaderConfig = new SegmentLoaderConfig()
{
@Override
public boolean isLazyLoadOnStart()
{
return true;
}

@Override
public List<StorageLocationConfig> getLocations()
{
return List.of(locationConfig);
}
};
final List<StorageLocation> storageLocations = loaderConfig.toStorageLocations();
SegmentLocalCacheManager manager = new SegmentLocalCacheManager(
storageLocations,
loaderConfig,
new LeastBytesUsedStorageLocationSelectorStrategy(storageLocations),
TestHelper.getTestIndexIO(jsonMapper, ColumnConfig.DEFAULT),
jsonMapper
);

final DataSegment dataSegment = TestSegmentUtils.makeSegment("foo", "v1", Intervals.of("2020/2021"));

manager.bootstrap(dataSegment, () -> {});
Segment actualBootstrapSegment = manager.acquireCachedSegment(dataSegment).orElse(null);
Assert.assertNotNull(actualBootstrapSegment);
Assert.assertEquals(dataSegment.getId(), actualBootstrapSegment.getId());
Assert.assertEquals(dataSegment.getInterval(), actualBootstrapSegment.getDataInterval());
}

@Test
public void testGetSegmentVirtualStorage() throws Exception
{
Expand Down