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

Jump to bottom

Enable autoManageMasterNodes in DataTierAllocationDeciderIT #93209

Merged
merged 1 commit into from
Jan 24, 2023
Merged

Enable autoManageMasterNodes in DataTierAllocationDeciderIT #93209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .../java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;

@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0, autoManageMasterNodes = false)
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
public class DataTierAllocationDeciderIT extends ESIntegTestCase {
private static final String index = "myindex";

Expand All @@ -63,7 +63,6 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
@Before
public void setUpMasterNode() {
// Ensure that master nodes cannot hold any data
internalCluster().setBootstrapMasterNodeIndex(0);
internalCluster().startMasterOnlyNode();
}

Expand Down Expand Up @@ -497,15 +496,15 @@ public void startDataNode() {
.putList("node.roles", Arrays.asList("master", "data", "ingest"))
.put("node.attr.box", "all")
.build();
startNodeAndWait(nodeSettings);
internalCluster().startNode(nodeSettings);
}

public void startContentOnlyNode() {
Settings nodeSettings = Settings.builder()
.putList("node.roles", Arrays.asList("master", "data_content", "ingest"))
.put("node.attr.box", "content")
.build();
startNodeAndWait(nodeSettings);
internalCluster().startNode(nodeSettings);
}

public void startHotOnlyNode() {
Expand All @@ -521,7 +520,7 @@ public void startHotOnlyNode(@Nullable String externalId) {
nodeSettings.put(NODE_EXTERNAL_ID_SETTING.getKey(), externalId);
}

startNodeAndWait(nodeSettings.build());
internalCluster().startNode(nodeSettings.build());
}

public void startWarmOnlyNode() {
Expand All @@ -536,7 +535,7 @@ public String startWarmOnlyNode(@Nullable String externalId) {
if (externalId != null) {
nodeSettings.put(NODE_EXTERNAL_ID_SETTING.getKey(), externalId);
}
return startNodeAndWait(nodeSettings.build());
return internalCluster().startNode(nodeSettings.build());
}

public void startColdOnlyNode() {
Expand All @@ -552,21 +551,15 @@ public String startColdOnlyNode(@Nullable String externalId) {
nodeSettings.put(NODE_EXTERNAL_ID_SETTING.getKey(), externalId);
}

return startNodeAndWait(nodeSettings.build());
return internalCluster().startNode(nodeSettings.build());
}

public void startFrozenOnlyNode() {
Settings nodeSettings = Settings.builder()
.putList("node.roles", Arrays.asList("master", "data_frozen", "ingest"))
.put("node.attr.box", "frozen")
.build();
startNodeAndWait(nodeSettings);
}

public String startNodeAndWait(Settings settings) {
var node = internalCluster().startNode(settings);
internalCluster().validateClusterFormed(); // autoManageMasterNodes is false so we must wait explicitly
return node;
internalCluster().startNode(nodeSettings);
}

private DesiredNode desiredNode(String externalId, DiscoveryNodeRole... roles) {
Expand Down