Skip to content

[8.19] Set default processor allocation for test clusters (#133204) #133213

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 22, 2025
Merged

[8.19] Set default processor allocation for test clusters (#133204) #133213

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
b9868ff
Set default processor allocation for test clusters (#133204)
jozala Aug 20, 2025
a83e5c2
Lowering the allocations during update to fit within available proces…
jonathan-buttner Aug 22, 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: 7 additions & 6 deletions ...-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ public void apply(Project project) {
|| buildParams.getBwcVersions().unreleasedInfo(version) == null
);

if (shouldConfigureTestClustersWithOneProcessor()) {
NamedDomainObjectContainer<ElasticsearchCluster> testClusters = (NamedDomainObjectContainer<ElasticsearchCluster>) project
.getExtensions()
.getByName(TestClustersPlugin.EXTENSION_NAME);
testClusters.configureEach(elasticsearchCluster -> elasticsearchCluster.setting("node.processors", "1"));
}
NamedDomainObjectContainer<ElasticsearchCluster> testClusters = (NamedDomainObjectContainer<ElasticsearchCluster>) project
.getExtensions()
.getByName(TestClustersPlugin.EXTENSION_NAME);
// Limit the number of allocated processors for all nodes to 2 in the cluster by default.
// This is to ensure that the tests run consistently across different environments.
String processorCount = shouldConfigureTestClustersWithOneProcessor() ? "1" : "2";
testClusters.configureEach(elasticsearchCluster -> elasticsearchCluster.setting("node.processors", processorCount));
}

private boolean shouldConfigureTestClustersWithOneProcessor() {
Expand Down
4 changes: 4 additions & 0 deletions ...-clusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultSettingsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ public Map<String, String> get(LocalNodeSpec nodeSpec) {
}
}

// Limit the number of allocated processors for all nodes in the cluster by default.
// This is to ensure that the tests run consistently across different environments.
settings.put("node.processors", "2");

// Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space
settings.put("cluster.routing.allocation.disk.watermark.low", "1b");
settings.put("cluster.routing.allocation.disk.watermark.high", "1b");
Expand Down
4 changes: 2 additions & 2 deletions ...tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/CreateFromDeploymentIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void testAttachToDeployment() throws IOException {
var results = infer(inferenceId, List.of("washing machine"));
assertNotNull(results.get("sparse_embedding"));

var updatedNumAllocations = randomIntBetween(1, 10);
var updatedNumAllocations = randomIntBetween(1, 2);
var updatedEndpointConfig = updateEndpoint(inferenceId, updatedEndpointConfig(updatedNumAllocations), TaskType.SPARSE_EMBEDDING);
assertThat(
updatedEndpointConfig.get("service_settings"),
Expand Down Expand Up @@ -128,7 +128,7 @@ public void testAttachWithModelId() throws IOException {
var results = infer(inferenceId, List.of("washing machine"));
assertNotNull(results.get("sparse_embedding"));

var updatedNumAllocations = randomIntBetween(1, 10);
var updatedNumAllocations = randomIntBetween(1, 2);
var updatedEndpointConfig = updateEndpoint(inferenceId, updatedEndpointConfig(updatedNumAllocations), TaskType.SPARSE_EMBEDDING);
assertThat(
updatedEndpointConfig.get("service_settings"),
Expand Down