Skip to content

[Test] Ensure assertion run only once #131174

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
merged 4 commits into from
Jul 15, 2025
Merged

[Test] Ensure assertion run only once #131174

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8863330
[Test] Ensure assertion runs only once
ywangd Jul 14, 2025
df1cc55
Merge remote-tracking branch 'origin/main' into es-130274-fix
ywangd Jul 14, 2025
463f6f5
Merge remote-tracking branch 'origin/main' into es-130274-fix
ywangd Jul 14, 2025
d6533e2
use addTemporaryStateListener
ywangd Jul 15, 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
48 changes: 26 additions & 22 deletions .../plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRepositoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.cluster.ClusterChangedEvent;
import org.elasticsearch.cluster.ClusterStateListener;
import org.elasticsearch.cluster.RestoreInProgress;
import org.elasticsearch.cluster.metadata.IndexMetadata;
Expand Down Expand Up @@ -655,39 +656,42 @@ public void testCcrRepositoryFailsToFetchSnapshotShardSizes() throws Exception {
try {
final SnapshotsInfoService snapshotsInfoService = getFollowerCluster().getCurrentMasterNodeInstance(SnapshotsInfoService.class);

final ClusterService clusterService = getFollowerCluster().getCurrentMasterNodeInstance(ClusterService.class);
final PlainActionFuture<Void> waitForAllShardSnapshotSizesFailures = new PlainActionFuture<>();
final ClusterStateListener listener = event -> {
if (RestoreInProgress.get(event.state()).isEmpty() == false && event.state().routingTable().hasIndex(followerIndex)) {
try {
final IndexRoutingTable indexRoutingTable = event.state().routingTable().index(followerIndex);
// this assertBusy completes because the listener is added after the InternalSnapshotsInfoService
// and ClusterService preserves the order of listeners.
assertBusy(() -> {
List<Long> sizes = indexRoutingTable.shardsWithState(ShardRoutingState.UNASSIGNED)
.stream()
.filter(shard -> shard.unassignedInfo().lastAllocationStatus() == AllocationStatus.FETCHING_SHARD_DATA)
.sorted(Comparator.comparingInt(ShardRouting::getId))
.map(shard -> snapshotsInfoService.snapshotShardSizes().getShardSize(shard))
.filter(Objects::nonNull)
.filter(size -> ShardRouting.UNAVAILABLE_EXPECTED_SHARD_SIZE == size)
.collect(Collectors.toList());
assertThat(sizes, hasSize(numberOfShards));
});
waitForAllShardSnapshotSizesFailures.onResponse(null);
} catch (Exception e) {
throw new AssertionError("Failed to retrieve all snapshot shard sizes", e);
final ClusterStateListener listener = new ClusterStateListener() {
@Override
public void clusterChanged(ClusterChangedEvent event) {
if (RestoreInProgress.get(event.state()).isEmpty() == false && event.state().routingTable().hasIndex(followerIndex)) {
try {
final IndexRoutingTable indexRoutingTable = event.state().routingTable().index(followerIndex);
// this assertBusy completes because the listener is added after the InternalSnapshotsInfoService
// and ClusterService preserves the order of listeners.
assertBusy(() -> {
List<Long> sizes = indexRoutingTable.shardsWithState(ShardRoutingState.UNASSIGNED)
.stream()
.filter(shard -> shard.unassignedInfo().lastAllocationStatus() == AllocationStatus.FETCHING_SHARD_DATA)
.sorted(Comparator.comparingInt(ShardRouting::getId))
.map(shard -> snapshotsInfoService.snapshotShardSizes().getShardSize(shard))
.filter(Objects::nonNull)
.filter(size -> ShardRouting.UNAVAILABLE_EXPECTED_SHARD_SIZE == size)
.collect(Collectors.toList());
assertThat(sizes, hasSize(numberOfShards));
});
clusterService.removeListener(this);
Copy link
Member Author

@ywangd ywangd Jul 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only this line is the real change. The others are due to using anonymous class (so that it can be referenced as this) instead of lambda.

waitForAllShardSnapshotSizesFailures.onResponse(null);
} catch (Exception e) {
throw new AssertionError("Failed to retrieve all snapshot shard sizes", e);
}
}
}
};

final ClusterService clusterService = getFollowerCluster().getCurrentMasterNodeInstance(ClusterService.class);
clusterService.addListener(listener);

logger.debug("--> creating follower index [{}]", followerIndex);
followerClient().execute(PutFollowAction.INSTANCE, putFollow(leaderIndex, followerIndex, ActiveShardCount.NONE));

waitForAllShardSnapshotSizesFailures.get(30L, TimeUnit.SECONDS);
clusterService.removeListener(listener);

assertThat(simulatedFailures.get(), equalTo(numberOfShards));

Expand Down