github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-27 17:10:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix MachineDependentHeapTests (#129699)

Browse source
This commit is contained in:
Jan Kuipers 2025-06-19 14:07:39 +02:00 • committed by GitHub
parent 04231e9798
commit 7f12f8009b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/MachineDependentHeapTests.java
View file

@ -10,6 +10,7 @@
package org.elasticsearch.server.cli; package org.elasticsearch.server.cli;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.FeatureFlag;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;
@ -55,7 +56,8 @@ public class MachineDependentHeapTests extends ESTestCase {
assertHeapOptions(64, containsInAnyOrder("-Xmx31744m", "-Xms31744m"), "master"); assertHeapOptions(64, containsInAnyOrder("-Xmx31744m", "-Xms31744m"), "master");
} }
public void testMlOnlyOptions() throws Exception { public void testMlOnlyOptions_new() throws Exception {
assumeTrue("feature flag must be enabled for new memory computation", new FeatureFlag("new_ml_memory_computation").isEnabled());
assertHeapOptions(1, containsInAnyOrder("-Xmx272m", "-Xms272m"), "ml"); assertHeapOptions(1, containsInAnyOrder("-Xmx272m", "-Xms272m"), "ml");
assertHeapOptions(4, containsInAnyOrder("-Xmx1092m", "-Xms1092m"), "ml"); assertHeapOptions(4, containsInAnyOrder("-Xmx1092m", "-Xms1092m"), "ml");
assertHeapOptions(32, containsInAnyOrder("-Xmx5460m", "-Xms5460m"), "ml"); assertHeapOptions(32, containsInAnyOrder("-Xmx5460m", "-Xms5460m"), "ml");
@ -65,6 +67,20 @@ public class MachineDependentHeapTests extends ESTestCase {
assertHeapOptions(263, containsInAnyOrder("-Xmx21228m", "-Xms21228m"), "ml"); assertHeapOptions(263, containsInAnyOrder("-Xmx21228m", "-Xms21228m"), "ml");
} }
public void testMlOnlyOptions_old() throws Exception {
assumeTrue(
"feature flag must be disabled for old memory computation",
new FeatureFlag("new_ml_memory_computation").isEnabled() == false
);
assertHeapOptions(1, containsInAnyOrder("-Xmx408m", "-Xms408m"), "ml");
assertHeapOptions(4, containsInAnyOrder("-Xmx1636m", "-Xms1636m"), "ml");
assertHeapOptions(32, containsInAnyOrder("-Xmx8192m", "-Xms8192m"), "ml");
assertHeapOptions(64, containsInAnyOrder("-Xmx11468m", "-Xms11468m"), "ml");
// We'd never see a node this big in Cloud, but this assertion proves that the 31GB absolute maximum
// eventually kicks in (because 0.4 * 16 + 0.1 * (263 - 16) > 31)
assertHeapOptions(263, containsInAnyOrder("-Xmx31744m", "-Xms31744m"), "ml");
}
public void testDataNodeOptions() throws Exception { public void testDataNodeOptions() throws Exception {
assertHeapOptions(1, containsInAnyOrder("-Xmx512m", "-Xms512m"), "data"); assertHeapOptions(1, containsInAnyOrder("-Xmx512m", "-Xms512m"), "data");
assertHeapOptions(8, containsInAnyOrder("-Xmx4096m", "-Xms4096m"), "data"); assertHeapOptions(8, containsInAnyOrder("-Xmx4096m", "-Xms4096m"), "data");

3
muted-tests.yml
View file

@ -568,9 +568,6 @@ tests:
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
method: test method: test
issue: https://github.com/elastic/elasticsearch/issues/129453 issue: https://github.com/elastic/elasticsearch/issues/129453
- class: org.elasticsearch.server.cli.MachineDependentHeapTests
method: testMlOnlyOptions
issue: https://github.com/elastic/elasticsearch/issues/129236
- class: org.elasticsearch.test.apmintegration.TracesApmIT - class: org.elasticsearch.test.apmintegration.TracesApmIT
method: testApmIntegration method: testApmIntegration
issue: https://github.com/elastic/elasticsearch/issues/129651 issue: https://github.com/elastic/elasticsearch/issues/129651