Skip to content
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

A node with roles [ml, remote_cluster_client] is still dedicated ML #66533

Merged
merged 2 commits into from
Dec 18, 2020
Merged

A node with roles [ml, remote_cluster_client] is still dedicated ML #66533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e0d970
A node with roles [ml, remote_cluster_client] is still dedicated ML
droberts195 Dec 17, 2020
0db908c
Fix logic to exclude remote_cluster_client on its own
droberts195 Dec 17, 2020
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
2 changes: 1 addition & 1 deletion ...tools/launchers/src/main/java/org/elasticsearch/tools/launchers/MachineDependentHeap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public static MachineNodeRole parse(InputStream config) {
return MachineNodeRole.DATA;
} else if (containsOnly(roles, "master")) {
return MachineNodeRole.MASTER_ONLY;
} else if (containsOnly(roles, "ml")) {
} else if (roles.contains("ml") && containsOnly(roles, "ml", "remote_cluster_client")) {
return MachineNodeRole.ML_ONLY;
} else {
return MachineNodeRole.DATA;
Expand Down
9 changes: 9 additions & 0 deletions .../tools/launchers/src/test/java/org/elasticsearch/tools/launchers/NodeRoleParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ public void testMlOnlyNode() throws IOException {
MachineDependentHeap.MachineNodeRole nodeRole = parseConfig(sb -> sb.append("node.roles: [ml]"));
assertThat(nodeRole, equalTo(ML_ONLY));

nodeRole = parseConfig(sb -> sb.append("node.roles: [ml, remote_cluster_client]"));
assertThat(nodeRole, equalTo(ML_ONLY));

nodeRole = parseConfig(sb -> sb.append("node.roles: [remote_cluster_client, ml]"));
assertThat(nodeRole, equalTo(ML_ONLY));

nodeRole = parseConfig(sb -> sb.append("node.roles: [remote_cluster_client]"));
assertThat(nodeRole, not(equalTo(ML_ONLY)));

nodeRole = parseConfig(sb -> sb.append("node.roles: [ml, some_other_role]"));
assertThat(nodeRole, not(equalTo(ML_ONLY)));
}
Expand Down