Skip to content

[fix][test] Stabilize delayed auditor lost bookie tests in AuditorLedgerCheckerTest #25957

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
merlimat merged 1 commit into from
Jun 7, 2026
Merged

[fix][test] Stabilize delayed auditor lost bookie tests in AuditorLedgerCheckerTest #25957

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
27 changes: 22 additions & 5 deletions ...ar-metadata/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,10 @@ public void testInnerDelayedAuditOfLostBookies() throws Exception {
final CountDownLatch underReplicaLatch = registerUrLedgerWatcher(ledgerList
.size());

// wait for 5 seconds before starting the recovery work when a bookie fails
urLedgerMgr.setLostBookieRecoveryDelay(5);
int lostBookieRecoveryDelaySeconds = 5;
// wait before starting the recovery work when a bookie fails
urLedgerMgr.setLostBookieRecoveryDelay(lostBookieRecoveryDelaySeconds);
Auditor auditorBookiesAuditor = getAuditorBookiesAuditor();

AtomicReference<String> shutdownBookieRef = new AtomicReference<>();
CountDownLatch shutdownLatch = new CountDownLatch(1);
Expand All @@ -407,12 +409,15 @@ public void testInnerDelayedAuditOfLostBookies() throws Exception {
}).start();

log.debug("Waiting for ledgers to be marked as under replicated");
assertFalse("audit of lost bookie isn't delayed", underReplicaLatch.await(4, TimeUnit.SECONDS));
waitUntilAuditTaskScheduled(auditorBookiesAuditor, 10, TimeUnit.SECONDS);
assertFalse("audit of lost bookie isn't delayed",
underReplicaLatch.await(lostBookieRecoveryDelaySeconds - 1, TimeUnit.SECONDS));
assertEquals("under replicated ledgers identified when it was not expected", 0,
urLedgerList.size());

// wait for another 5 seconds for the ledger to get reported as under replicated
assertTrue("audit of lost bookie isn't delayed", underReplicaLatch.await(2, TimeUnit.SECONDS));
// wait for the delayed task to run and report the ledger as under replicated
assertTrue("audit of lost bookie wasn't triggered after delay",
underReplicaLatch.await(3, TimeUnit.SECONDS));

assertTrue("Ledger is not marked as underreplicated:" + ledgerId,
urLedgerList.contains(ledgerId));
Expand Down Expand Up @@ -904,6 +909,18 @@ private void waitForAuditToComplete() throws Exception {
throw new TimeoutException("Could not find an audit within 5 seconds");
}

private void waitUntilAuditTaskScheduled(Auditor auditor, long timeout, TimeUnit unit) throws Exception {
long deadlineNanos = System.nanoTime() + unit.toNanos(timeout);
while (System.nanoTime() < deadlineNanos) {
Future<?> auditTask = auditor.getAuditTask();
if (auditTask != null && !auditTask.isDone()) {
return;
}
Thread.sleep(100);
}
fail("Timed out waiting for delayed audit task to be scheduled");
}

/**
* Wait for ledger to be underreplicated, and to be missing all replicas specified.
*/
Expand Down
Loading