Skip to content

[Test] Make unable master node error more explicit #127891

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
May 9, 2025
Merged

[Test] Make unable master node error more explicit #127891

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30711ae
[Test] Make unable master node error more explicit
ywangd May 8, 2025
f73a46b
Merge branch 'main' into trivial-npe-handling-for-get-master-name
elasticmachine May 9, 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
6 changes: 5 additions & 1 deletion test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2040,7 +2040,11 @@ public String getMasterName(@Nullable String viaNode) {
try {
ClusterServiceUtils.awaitClusterState(logger, state -> state.nodes().getMasterNode() != null, clusterService(viaNode));
final ClusterState state = client(viaNode).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
return state.nodes().getMasterNode().getName();
final DiscoveryNode masterNode = state.nodes().getMasterNode();
if (masterNode == null) {
throw new AssertionError("Master is not stable but the method expects a stable master node");
}
return masterNode.getName();
} catch (Exception e) {
logger.warn("Can't fetch cluster state", e);
throw new RuntimeException("Can't get master node " + e.getMessage(), e);
Expand Down