Skip to content

[test] fix flaky testRebalanceWithRemoteLog #3409

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

Closed
wattt3 wants to merge 1 commit into from
+27 −1
Closed

[test] fix flaky testRebalanceWithRemoteLog #3409

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...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 @@ -311,7 +311,7 @@ private void produceRecordsAndWaitRemoteLogCopy(
0,
baseOffset + i * 10L);
}
FLUSS_CLUSTER_EXTENSION.waitUntilSomeLogSegmentsCopyToRemote(
FLUSS_CLUSTER_EXTENSION.waitUntilAllLogSegmentsCopyToRemote(
new TableBucket(tb.getTableId(), 0));
}
}
26 changes: 26 additions & 0 deletions fluss-server/src/test/java/org/apache/fluss/server/testutils/FlussClusterExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,32 @@ public void waitUntilSomeLogSegmentsCopyToRemote(TableBucket tableBucket) {
});
}

/**
* Wait until all log segments (non-active) copy to remote. This method waits until the remote
* log end offset reaches the base offset of the active segment.
*/
public void waitUntilAllLogSegmentsCopyToRemote(TableBucket tableBucket) {
retry(
Duration.ofMinutes(2),
() -> {
int leader = waitAndGetLeader(tableBucket);
TabletServer tabletServer = getTabletServerById(leader);
ReplicaManager.HostedReplica hostedReplica =
tabletServer.getReplicaManager().getReplica(tableBucket);
assertThat(hostedReplica).isInstanceOf(ReplicaManager.OnlineReplica.class);
Replica replica = ((ReplicaManager.OnlineReplica) hostedReplica).getReplica();
long activeSegmentBaseOffset =
replica.getLogTablet().activeLogSegment().getBaseOffset();
assertThat(
tabletServer
.getReplicaManager()
.getRemoteLogManager()
.remoteLogTablet(tableBucket)
.getRemoteLogEndOffset())
.hasValue(activeSegmentBaseOffset);
});
}

public void triggerAndWaitSnapshot(TablePath tablePath) throws Exception {
Optional<TableRegistration> table = zooKeeperClient.getTable(tablePath);
//noinspection SimplifyOptionalCallChains (Java 8 compatibility)
Expand Down