Skip to content

[server] Fix flaky RebalanceManagerITCase.testRebalanceWithRemoteLog #3313

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
Kaixuan-Duan wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −2
Open

[server] Fix flaky RebalanceManagerITCase.testRebalanceWithRemoteLog #3313

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: 23 additions & 2 deletions ...r/src/test/java/org/apache/fluss/server/coordinator/rebalance/RebalanceManagerITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

import static org.apache.fluss.record.TestData.DATA1;
import static org.apache.fluss.record.TestData.DATA1_SCHEMA;
Expand Down Expand Up @@ -148,7 +149,7 @@ void testRebalanceWithRemoteLog() throws Exception {
RemoteLogManager remoteLogManager = tabletServer.getReplicaManager().getRemoteLogManager();
RemoteLogTablet remoteLogTablet = remoteLogManager.remoteLogTablet(tb);

RemoteLogManifest manifest = remoteLogTablet.currentManifest();
RemoteLogManifest manifest = waitForRemoteLogManifestReady(remoteLogTablet);
assertThat(manifest.getPhysicalTablePath().getTablePath()).isEqualTo(DATA1_TABLE_PATH);
assertThat(manifest.getTableBucket()).isEqualTo(tb);
int remoteLogSize = manifest.getRemoteLogSegmentList().size();
Expand Down Expand Up @@ -219,7 +220,10 @@ void testRebalanceWithRemoteLog() throws Exception {
RemoteLogManifest newManifest = leaderRlt.currentManifest();
assertThat(newManifest.getPhysicalTablePath().getTablePath()).isEqualTo(DATA1_TABLE_PATH);
assertThat(newManifest.getTableBucket()).isEqualTo(tb);
assertThat(newManifest.getRemoteLogSegmentList().size()).isEqualTo(remoteLogSize);
// remoteLogSize is captured when async copy may not finish all segments yet,
// so the new leader's manifest can contain more segments than remoteLogSize.
assertThat(newManifest.getRemoteLogSegmentList().size())
.isGreaterThanOrEqualTo(remoteLogSize);
}

private void fromCoordinatorContext(
Expand Down Expand Up @@ -314,4 +318,21 @@ private void produceRecordsAndWaitRemoteLogCopy(
FLUSS_CLUSTER_EXTENSION.waitUntilSomeLogSegmentsCopyToRemote(
new TableBucket(tb.getTableId(), 0));
}

/**
* Wait until the in-memory remote log manifest is ready with at least one segment. {@link
* FlussClusterExtension#waitUntilSomeLogSegmentsCopyToRemote} only ensures ZK has manifest
* handle, but the in-memory manifest may not be updated yet.
*/
private RemoteLogManifest waitForRemoteLogManifestReady(RemoteLogTablet remoteLogTablet) {
AtomicReference<RemoteLogManifest> manifestRef = new AtomicReference<>();
retry(
Duration.ofMinutes(2),
() -> {
RemoteLogManifest m = remoteLogTablet.currentManifest();
assertThat(m.getRemoteLogSegmentList().size()).isGreaterThan(0);
manifestRef.set(m);
});
return manifestRef.get();
}
}