Skip to content

[9.0] fix MachineDependentHeapTests (#129699) #129849

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 1 commit into from
Jun 23, 2025
Merged

[9.0] fix MachineDependentHeapTests (#129699) #129849

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
18 changes: 17 additions & 1 deletion ...ools/server-cli/src/test/java/org/elasticsearch/server/cli/MachineDependentHeapTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
package org.elasticsearch.server.cli;

import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.FeatureFlag;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.ESTestCase.WithoutSecurityManager;
import org.hamcrest.Matcher;
Expand Down Expand Up @@ -57,7 +58,8 @@ public void testMasterOnlyOptions() throws Exception {
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(4, containsInAnyOrder("-Xmx1092m", "-Xms1092m"), "ml");
assertHeapOptions(32, containsInAnyOrder("-Xmx5460m", "-Xms5460m"), "ml");
Expand All @@ -67,6 +69,20 @@ public void testMlOnlyOptions() throws Exception {
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 {
assertHeapOptions(1, containsInAnyOrder("-Xmx512m", "-Xms512m"), "data");
assertHeapOptions(8, containsInAnyOrder("-Xmx4096m", "-Xms4096m"), "data");
Expand Down