Skip to content

Fix test clusters to respect user-provided ordering of settings. #137179

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

Closed
mosche wants to merge 3 commits into from
Closed

Fix test clusters to respect user-provided ordering of settings. #137179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bec7653
Fix test clusters to respect user-provided ordering of settings.
mosche Oct 27, 2025
ada4873
Revert "Fix test clusters to respect user-provided ordering of settin…
mosche Oct 28, 2025
528c1f3
Restore sorting when applying loggers
mosche Oct 28, 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
3 changes: 2 additions & 1 deletion ...sters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
Expand Down Expand Up @@ -408,7 +409,7 @@ private void writeConfiguration() {

try {
// Write settings to elasticsearch.yml
Map<String, String> finalSettings = new HashMap<>();
Map<String, String> finalSettings = new LinkedHashMap<>();
finalSettings.put("cluster.name", spec.getCluster().getName());
if (name != null) {
finalSettings.put("node.name", name);
Expand Down
9 changes: 5 additions & 4 deletions ...clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalSpecBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand All @@ -32,7 +33,7 @@
public abstract class AbstractLocalSpecBuilder<T extends LocalSpecBuilder<?>> implements LocalSpecBuilder<T> {
private final AbstractLocalSpecBuilder<?> parent;
private final List<SettingsProvider> settingsProviders = new ArrayList<>();
private final Map<String, String> settings = new HashMap<>();
private final Map<String, String> settings = new LinkedHashMap<>();
private final List<EnvironmentProvider> environmentProviders = new ArrayList<>();
private final Map<String, String> environment = new HashMap<>();
private final Map<String, DefaultPluginInstallSpec> modules = new HashMap<>();
Expand Down Expand Up @@ -321,7 +322,7 @@ private <T> List<T> inherit(Supplier<List<T>> parent, List<T> child) {
}

private <T> Set<T> inherit(Supplier<Set<T>> parent, Set<T> child) {
Set<T> combinedSet = new HashSet<>();
Set<T> combinedSet = new LinkedHashSet<>();
if (this.parent != null) {
combinedSet.addAll(parent.get());
}
Expand All @@ -330,7 +331,7 @@ private <T> Set<T> inherit(Supplier<Set<T>> parent, Set<T> child) {
}

private <K, V> Map<K, V> inherit(Supplier<Map<K, V>> parent, Map<K, V> child) {
Map<K, V> combinedMap = new HashMap<>();
Map<K, V> combinedMap = new LinkedHashMap<>();
if (this.parent != null) {
combinedMap.putAll(parent.get());
}
Expand Down
5 changes: 3 additions & 2 deletions test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.nio.file.Path;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -236,7 +237,7 @@ public boolean hasRole(String role) {
* @return the configured setting value or provided default
*/
public String getSetting(String setting, String defaultValue) {
Map<String, String> allSettings = new HashMap<>();
Map<String, String> allSettings = new LinkedHashMap<>();
allSettings.putAll(resolveSettings());
allSettings.putAll(resolveKeystore());

Expand All @@ -255,7 +256,7 @@ public String getSetting(String setting, String defaultValue) {
* @return resolved settings for node
*/
public Map<String, String> resolveSettings() {
Map<String, String> resolvedSettings = new HashMap<>();
Map<String, String> resolvedSettings = new LinkedHashMap<>();
settingsProviders.forEach(p -> resolvedSettings.putAll(p.get(getFilteredSpec(p, null))));
resolvedSettings.putAll(settings);
return resolvedSettings;
Expand Down