Skip to content

[Test] Wait on master node for shard started #131172

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

[Test] Wait on master node for shard started #131172

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95c409b
[Test] Wait on master node for shard started
ywangd Jul 14, 2025
acd8969
Update server/src/internalClusterTest/java/org/elasticsearch/cluster/…
ywangd Jul 14, 2025
77e1cc9
Merge branch 'main' into es-131146-fix
elasticmachine Jul 14, 2025
eacbff7
Merge branch 'main' into es-131146-fix
elasticmachine Jul 14, 2025
ef90ac0
Merge remote-tracking branch 'origin/main' into es-131146-fix
ywangd Jul 14, 2025
b713053
unmute
ywangd Jul 14, 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
21 changes: 7 additions & 14 deletions ...ClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
import org.elasticsearch.cluster.DiskUsageIntegTestCase;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.node.DiscoveryNodeRole;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.routing.ShardRoutingState;
Expand Down Expand Up @@ -86,20 +87,12 @@ public void testFloodStageExceeded() throws Exception {
// Verify that we can still move shards around even while blocked
final String newDataNodeName = internalCluster().startDataOnlyNode();
final String newDataNodeId = clusterAdmin().prepareNodesInfo(newDataNodeName).get().getNodes().get(0).getNode().getId();
assertBusy(() -> {
final ShardRouting primaryShard = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
.clear()
.setRoutingTable(true)
.setNodes(true)
.setIndices(indexName)
.get()
.getState()
.routingTable()
.index(indexName)
.shard(0)
.primaryShard();
assertThat(primaryShard.state(), equalTo(ShardRoutingState.STARTED));
assertThat(primaryShard.currentNodeId(), equalTo(newDataNodeId));
awaitClusterState(state -> {
final ShardRouting primaryShard = state.routingTable(ProjectId.DEFAULT).index(indexName).shard(0).primaryShard();
if (primaryShard.state() != ShardRoutingState.STARTED) {
return false;
}
return newDataNodeId.equals(primaryShard.currentNodeId());
});

// Verify that the block is removed once the shard migration is complete
Expand Down