Skip to content

Make RestrictionTrackers.getProgress unblocking until initial progress successfully returned #36750

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
Abacn merged 7 commits into from
Nov 24, 2025
Merged

Make RestrictionTrackers.getProgress unblocking until initial progress successfully returned #36750

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a951e4b
Make RestrictionTrackers.getProgress unblocking
Abacn Nov 6, 2025
50a1404
comments
Abacn Nov 6, 2025
5e96e2a
address comments - add 1 min blocking time
Abacn Nov 7, 2025
2af9896
Add log
Abacn Nov 8, 2025
2454876
only change behavior when initial progress never evaluated
Abacn Nov 20, 2025
ef7838d
simplify tests
Abacn Nov 21, 2025
6177e25
changed to waitUntilBlocking
Abacn Nov 24, 2025
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
53 changes: 23 additions & 30 deletions ...ava/core/src/test/java/org/apache/beam/sdk/fn/splittabledofn/RestrictionTrackersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,10 @@ public synchronized void releaseLock() {
notifyAll();
}

public synchronized boolean isBlocked() {
return isBlocked;
public void waitUntil(boolean blocking) throws InterruptedException {
while (isBlocked != blocking) {
Thread.sleep(1);
}
}
}

Expand All @@ -179,46 +181,37 @@ public void testClaimObserversMaintainBacklogInterfaces() {
assertThat(hasSize, instanceOf(HasProgress.class));
}

private void testBlocking(String testCase) throws InterruptedException {
RestrictionTrackerWithProgress withProgress;
if ("tryClaim".equals(testCase)) {
withProgress = new RestrictionTrackerWithProgress(true, false);
} else if ("trySplit".equals(testCase)) {
withProgress = new RestrictionTrackerWithProgress(false, true);
} else {
throw new IllegalArgumentException("unknown test case " + testCase);
}
@Test
public void testClaimObserversProgressNonBlockingOnTryClaim() throws InterruptedException {
RestrictionTrackerWithProgress withProgress = new RestrictionTrackerWithProgress(true, false);
RestrictionTracker<Object, Object> tracker =
RestrictionTrackers.observe(withProgress, new RestrictionTrackers.NoopClaimObserver<>());
Runnable runnable;
if ("tryClaim".equals(testCase)) {
runnable = () -> tracker.tryClaim(new Object());
} else {
runnable = () -> tracker.trySplit(0.5);
}
Thread blocking = new Thread(runnable);
Thread blocking = new Thread(() -> tracker.tryClaim(new Object()));
blocking.start();
while (!withProgress.isBlocked()) {
Thread.sleep(1);
}
withProgress.waitUntil(true);
RestrictionTracker.Progress progress =
((RestrictionTrackers.RestrictionTrackerObserverWithProgress) tracker).getProgress(1);
assertEquals(RestrictionTracker.Progress.NONE, progress);
withProgress.releaseLock();
while (withProgress.isBlocked()) {
Thread.sleep(1);
}
withProgress.waitUntil(false);
progress = ((HasProgress) tracker).getProgress();
assertEquals(RestrictionTrackerWithProgress.REPORT_PROGRESS, progress);
}

@Test
public void testClaimObserversProgressNonBlockingOnTryClaim() throws InterruptedException {
testBlocking("tryClaim");
}

@Test
public void testClaimObserversProgressNonBlockingOnTrySplit() throws InterruptedException {
testBlocking("trySplit");
RestrictionTrackerWithProgress withProgress = new RestrictionTrackerWithProgress(false, true);
RestrictionTracker<Object, Object> tracker =
RestrictionTrackers.observe(withProgress, new RestrictionTrackers.NoopClaimObserver<>());
Thread blocking = new Thread(() -> tracker.trySplit(0.5));
blocking.start();
withProgress.waitUntil(true);
RestrictionTracker.Progress progress =
((RestrictionTrackers.RestrictionTrackerObserverWithProgress) tracker).getProgress(1);
assertEquals(RestrictionTracker.Progress.NONE, progress);
withProgress.releaseLock();
withProgress.waitUntil(false);
progress = ((HasProgress) tracker).getProgress();
assertEquals(RestrictionTrackerWithProgress.REPORT_PROGRESS, progress);
}
}
Loading