Skip to content

Change FakeClock.sleep() to be safely re-entrant in attempt to fix StreamingDataflowWorkerTest flakes. #36754

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
scwhittle merged 1 commit into from
Nov 10, 2025
Merged

Change FakeClock.sleep() to be safely re-entrant in attempt to fix StreamingDataflowWorkerTest flakes. #36754

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
22 changes: 13 additions & 9 deletions ...er/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3623,8 +3623,8 @@ public void testLatencyAttributionToQueuedState() throws Exception {
worker.stop();

assertEquals(
awrSink.getLatencyAttributionDuration(workToken, State.QUEUED), Duration.millis(1000));
assertEquals(awrSink.getLatencyAttributionDuration(workToken + 1, State.QUEUED), Duration.ZERO);
Duration.millis(1000), awrSink.getLatencyAttributionDuration(workToken, State.QUEUED));
assertEquals(Duration.ZERO, awrSink.getLatencyAttributionDuration(workToken + 1, State.QUEUED));
}

@Test
Expand Down Expand Up @@ -3657,7 +3657,7 @@ public void testLatencyAttributionToActiveState() throws Exception {
worker.stop();

assertEquals(
awrSink.getLatencyAttributionDuration(workToken, State.ACTIVE), Duration.millis(1000));
Duration.millis(1000), awrSink.getLatencyAttributionDuration(workToken, State.ACTIVE));
}

@Test
Expand Down Expand Up @@ -3695,7 +3695,7 @@ public void testLatencyAttributionToReadingState() throws Exception {
worker.stop();

assertEquals(
awrSink.getLatencyAttributionDuration(workToken, State.READING), Duration.millis(1000));
Duration.millis(1000), awrSink.getLatencyAttributionDuration(workToken, State.READING));
}

@Test
Expand Down Expand Up @@ -3735,7 +3735,7 @@ public void testLatencyAttributionToCommittingState() throws Exception {
worker.stop();

assertEquals(
awrSink.getLatencyAttributionDuration(workToken, State.COMMITTING), Duration.millis(1000));
Duration.millis(1000), awrSink.getLatencyAttributionDuration(workToken, State.COMMITTING));
}

@Test
Expand Down Expand Up @@ -3784,11 +3784,11 @@ public void testLatencyAttributionPopulatedInCommitRequest() throws Exception {
// Initial fake latency provided to FakeWindmillServer when invoke receiveWork in
// GetWorkStream().
assertEquals(
workItemCommitRequest.get((long) workToken).getPerWorkItemLatencyAttributions(1),
LatencyAttribution.newBuilder()
.setState(State.GET_WORK_IN_TRANSIT_TO_USER_WORKER)
.setTotalDurationMillis(1000)
.build());
.build(),
workItemCommitRequest.get((long) workToken).getPerWorkItemLatencyAttributions(1));
}
}

Expand Down Expand Up @@ -4475,7 +4475,7 @@ public synchronized void sleep(Duration duration) {
if (duration.isShorterThan(Duration.ZERO)) {
throw new UnsupportedOperationException("Cannot sleep backwards in time");
}
Instant endOfSleep = now.plus(duration);
final Instant endOfSleep = now.plus(duration);
while (true) {
Job job = jobs.peek();
if (job == null || job.when.isAfter(endOfSleep)) {
Expand All @@ -4485,7 +4485,11 @@ public synchronized void sleep(Duration duration) {
now = job.when;
job.work.run();
}
now = endOfSleep;
// Handle possibly re-entrant sleep. The contained sleep may advance now
// past endOfSleep.
if (endOfSleep.isAfter(now)) {
now = endOfSleep;
}
}

private synchronized void schedule(Duration fromNow, Runnable work) {
Expand Down
Loading