github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-27 17:10:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove test dependencies on cluster state API master waiting (#129118)

Browse source 
As preparation for running the cluster state API on the local node, we
need to update these tests that currently depend on that API running on
(and waiting for) the master node.

Relates #127212
This commit is contained in:
Niels Bauman 2025-06-16 11:04:39 -03:00 • committed by GitHub
parent e8665b9ec5
commit 19a4ed0188
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 85 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
View file

@ -962,6 +962,16 @@ public abstract class ESIntegTestCase extends ESTestCase {
safeAwait(listener, TEST_REQUEST_TIMEOUT);
}
/**
* Waits for all nodes in the cluster to have a consistent view of which node is currently the master.
*/
public void awaitMasterNode() {
// The cluster health API always runs on the master node, and the master only completes cluster state publication when all nodes
// in the cluster have accepted the new cluster state. By waiting for all events to have finished on the master node, we ensure
// that the whole cluster has a consistent view of which node is the master.
clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setTimeout(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get();
}
/**
* Waits for a random node in the cluster to not see a master node in the cluster state.
* Note that this does not guarantee that all other nodes in the cluster are on the same cluster state version already.
@ -1360,8 +1370,14 @@ public abstract class ESIntegTestCase extends ESTestCase {
}
protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry namedWriteableRegistry) {
// This check has very little value in external test clusters and there is no guaranteed method of obtaining the master cluster
// state in those clusters.
if (isInternalCluster() == false) {
return;
}
final PlainActionFuture<Void> future = new PlainActionFuture<>();
final List<SubscribableListener<ClusterStateResponse>> localStates = new ArrayList<>(cluster().size());
final var masterName = internalCluster().getMasterName();
for (Client client : cluster().getClients()) {
localStates.add(
SubscribableListener.newForked(
@ -1371,7 +1387,7 @@ public abstract class ESIntegTestCase extends ESTestCase {
}
try (RefCountingListener refCountingListener = new RefCountingListener(future)) {
SubscribableListener.<ClusterStateResponse>newForked(
l -> client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).all().execute(l)
l -> client(masterName).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).all().execute(l)
).andThenAccept(masterStateResponse -> {
byte[] masterClusterStateBytes = ClusterState.Builder.toBytes(masterStateResponse.getState());
// remove local node reference