Skip to content

[test] Stabilize RemoteLogDownloader prefetch test #3968

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
void-ptr974 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[test] Stabilize RemoteLogDownloader prefetch test #3968

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
18 changes: 17 additions & 1 deletion ...ient/src/test/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,26 @@ void beforeEach() {
@Test
void testPrefetchNum() throws Exception {
RemoteFileDownloader remoteFileDownloader = new RemoteFileDownloader(1);
CountDownLatch fetchLoopBlocked = new CountDownLatch(1);
CountDownLatch continueFetchLoop = new CountDownLatch(1);
RemoteLogDownloader remoteLogDownloader =
new RemoteLogDownloader(
DATA1_TABLE_PATH.toString(),
conf,
remoteFileDownloader,
scannerMetricGroup,
10L);
10L) {
@Override
void fetchOnce() throws Exception {
// Pause after all requests are scheduled so the loop cannot acquire a
// recycled permit before it is asserted below.
if (scannerMetricGroup.remoteFetchRequestCount().getCount() >= 5) {

@Jackeyzhe Jackeyzhe Aug 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice fix, nit: I think extracting 5 as a named constant (e.g. EXPECTED_COUNT) or a variable would be reasonable

fetchLoopBlocked.countDown();
continueFetchLoop.await();
}
super.fetchOnce();
}
};
try {
// trigger auto download.
remoteLogDownloader.start();
Expand Down Expand Up @@ -139,9 +152,11 @@ void testPrefetchNum() throws Exception {
remoteLogSegmentFilesLength(remoteLogSegments, remoteLogTabletDir, 5));
assertThat(remoteLogDownloader.getPrefetchSemaphore().availablePermits()).isEqualTo(0);

assertThat(fetchLoopBlocked.await(30, TimeUnit.SECONDS)).isTrue();
futures.get(1).getRecycleCallback().run();
futures.get(2).getRecycleCallback().run();
assertThat(remoteLogDownloader.getPrefetchSemaphore().availablePermits()).isEqualTo(2);
continueFetchLoop.countDown();
// the removal of log files are async, so we need to wait for the removal.
retry(
Duration.ofMinutes(1),
Expand All @@ -151,6 +166,7 @@ void testPrefetchNum() throws Exception {
remoteLogDownloader.close();
assertThat(localLogDir.toFile().exists()).isFalse();
} finally {
continueFetchLoop.countDown();
IOUtils.closeQuietly(remoteLogDownloader);
IOUtils.closeQuietly(remoteFileDownloader);
}
Expand Down