Skip to content

[hotfix] [runtime/tests] Wait for clock advance in BlobServerCleanupTest #27803

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

[hotfix] [runtime/tests] Wait for clock advance in BlobServerCleanupTest #27803

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
25 changes: 13 additions & 12 deletions flink-runtime/src/test/java/org/apache/flink/runtime/blob/BlobServerCleanupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,20 @@ private static BlobServer createTestInstance(
}

@Test
void testTransientBlobNoJobCleanup()
throws IOException, InterruptedException, ExecutionException {
void testTransientBlobNoJobCleanup() throws Exception {
testTransientBlobCleanup(null);
}

@Test
void testTransientBlobForJobCleanup()
throws IOException, InterruptedException, ExecutionException {
void testTransientBlobForJobCleanup() throws Exception {
testTransientBlobCleanup(new JobID());
}

/**
* Tests that {@link TransientBlobCache} cleans up after a default TTL and keeps files which are
* constantly accessed.
*/
private void testTransientBlobCleanup(@Nullable final JobID jobId)
throws IOException, InterruptedException, ExecutionException {
private void testTransientBlobCleanup(@Nullable final JobID jobId) throws Exception {

// 1s should be a safe-enough buffer to still check for existence after a BLOB's last access
long cleanupInterval = 1L; // in seconds
Expand Down Expand Up @@ -150,9 +147,11 @@ private void testTransientBlobCleanup(@Nullable final JobID jobId)
final JobID jobIdHA = (jobId == null) ? new JobID() : jobId;
final BlobKey keyHA = put(server, jobIdHA, data, PERMANENT_BLOB);

// access key1, verify expiry times (delay at least 1ms to also verify key2 expiry is
// unchanged)
Thread.sleep(1);
// access key1, verify expiry times (wait until wall-clock advances so we can assert
// key2 expiry is unchanged even on slow or contended CI hosts)
final long afterKey2PutMillis = System.currentTimeMillis();
CommonTestUtils.waitUntilCondition(
() -> System.currentTimeMillis() > afterKey2PutMillis, 1L);
cleanupLowerBound = System.currentTimeMillis() + cleanupInterval;
verifyContents(server, jobId, key1, data);
final Long key1ExpiryAfterGet = transientBlobExpiryTimes.get(Tuple2.of(jobId, key1));
Expand All @@ -161,9 +160,11 @@ private void testTransientBlobCleanup(@Nullable final JobID jobId)
assertThat(key2ExpiryAfterPut)
.isEqualTo(transientBlobExpiryTimes.get(Tuple2.of(jobId, key2)));

// access key2, verify expiry times (delay at least 1ms to also verify key1 expiry is
// unchanged)
Thread.sleep(1);
// access key2, verify expiry times (wait until wall-clock advances so we can assert
// key1 expiry is unchanged even on slow or contended CI hosts)
final long afterKey1AccessMillis = System.currentTimeMillis();
CommonTestUtils.waitUntilCondition(
() -> System.currentTimeMillis() > afterKey1AccessMillis, 1L);
cleanupLowerBound = System.currentTimeMillis() + cleanupInterval;
verifyContents(server, jobId, key2, data2);
assertThat(key1ExpiryAfterGet)
Expand Down