Skip to content

[FLUSS-1873][server] Added Retry Handler to Address Snapshotting Test Asynchrony #1881

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
polyzos merged 1 commit into from
Oct 30, 2025
Merged

[FLUSS-1873][server] Added Retry Handler to Address Snapshotting Test Asynchrony #1881

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
24 changes: 21 additions & 3 deletions fluss-server/src/test/java/org/apache/fluss/server/replica/ReplicaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ void testBrokenSnapshotRecovery(@TempDir File snapshotKvTabletDir) throws Except
putRecordsToLeader(kvReplica, kvRecords);

// trigger first snapshot
scheduledExecutorService.triggerNonPeriodicScheduledTask();
triggerSnapshotTaskWithRetry(scheduledExecutorService, 5);
kvSnapshotStore.waitUntilSnapshotComplete(tableBucket, 0);

// put more data and create second snapshot
Expand All @@ -514,7 +514,7 @@ void testBrokenSnapshotRecovery(@TempDir File snapshotKvTabletDir) throws Except
putRecordsToLeader(kvReplica, kvRecords);

// trigger second snapshot
scheduledExecutorService.triggerNonPeriodicScheduledTask();
triggerSnapshotTaskWithRetry(scheduledExecutorService, 5);
kvSnapshotStore.waitUntilSnapshotComplete(tableBucket, 1);

// put more data and create third snapshot (this will be the broken one)
Expand All @@ -525,7 +525,7 @@ void testBrokenSnapshotRecovery(@TempDir File snapshotKvTabletDir) throws Except
putRecordsToLeader(kvReplica, kvRecords);

// trigger third snapshot
scheduledExecutorService.triggerNonPeriodicScheduledTask();
triggerSnapshotTaskWithRetry(scheduledExecutorService, 5);
CompletedSnapshot snapshot2 = kvSnapshotStore.waitUntilSnapshotComplete(tableBucket, 2);

// verify that snapshot2 is the latest one before we break it
Expand Down Expand Up @@ -766,4 +766,22 @@ public void reset() {
isScheduled = false;
}
}

/** A helper function with support for retries for flaky triggering operations. */
private static void triggerSnapshotTaskWithRetry(
ManuallyTriggeredScheduledExecutorService scheduledExecutorService, int maxRetries)
throws Exception {
for (int i = 0; i < maxRetries; i++) {
try {
scheduledExecutorService.triggerNonPeriodicScheduledTask();
return;
} catch (java.util.NoSuchElementException e) {
if (i == maxRetries - 1) {
throw e;
}

Thread.sleep(50);
}
}
}
}