Merge pull request #24901 from vespa-engine/bratseth/deterministic-orderv8.86.28

Deterministic host flavor order

2 files changed, 6 insertions, 2 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index 61b56912146..11ddf23772f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -6,6 +6,8 @@ import com.yahoo.config.provisioning.FlavorsConfig;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -27,7 +29,10 @@ public class NodeFlavors {
     }
 
     public NodeFlavors(Collection<Flavor> flavors) {
-        configuredFlavors = flavors.stream().collect(Collectors.toUnmodifiableMap(f -> f.name(), f -> f));
+        Map<String, Flavor> map = new LinkedHashMap<>();
+        for (Flavor flavor : flavors)
+            map.put(flavor.name(), flavor);
+        configuredFlavors = Collections.unmodifiableMap(map);
     }
 
     public List<Flavor> getFlavors() {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
index 409dc4dac1a..2cc20f50bbd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
@@ -274,7 +274,6 @@ public class HostCapacityMaintainerTest {
         tester.maintain();
 
         // Hosts are provisioned
-        // TODO: Not thread safe as HostCapacityMaintainer may count hoists before we are done provisioning
         assertEquals(2, tester.provisionedHostsMatching(resources1));
         assertEquals(0, tester.hostProvisioner.deprovisionedHosts());