Skip to content

Fix testing NPE in doEnsureClusterStateConsistency() #131859

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 2 commits into from
Aug 5, 2025
Merged

Fix testing NPE in doEnsureClusterStateConsistency() #131859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aadc93
Fix test infra NPE in doEnsureClusterStateConsistency
DiannaHohensee Jul 24, 2025
e52a547
Merge branch 'main' into 2025/07/24/fix-NPE
DiannaHohensee Aug 1, 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
13 changes: 13 additions & 0 deletions test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,15 @@ private void setMultiProjectParams(Map<String, String> xContentParams) {
}
}

/**
* Verifies that all nodes in the cluster see the same master node and cluster UUID and use the same JSON serialization.
* <ul>
* <li> Fetches the cluster state from every node in the cluster </li>
* <li> Fetches the master node's view of the cluster state </li>
* <li> Compares each node's view with the master node's </li>
* </ul>
* @param namedWriteableRegistry
*/
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.
Expand Down Expand Up @@ -1408,6 +1417,10 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
);
Map<String, Object> masterStateMap = convertToMap(masterClusterState, xContentParams());
String masterId = masterClusterState.nodes().getMasterNodeId();
if (masterId == null) {
logger.warn("Failed to find an elected master in the cluster state: " + masterClusterState);
throw new AssertionError("Unable to find master in cluster state. Expecting a stable master node");
}
for (SubscribableListener<ClusterStateResponse> localStateListener : localStates) {
localStateListener.andThenAccept(localClusterStateResponse -> {
byte[] localClusterStateBytes = ClusterState.Builder.toBytes(localClusterStateResponse.getState());
Expand Down