aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorHarald Musum <musum@yahooinc.com>2022-03-23 11:54:14 +0100
committerHarald Musum <musum@yahooinc.com>2022-03-23 11:54:14 +0100
commitfbe19f78dc502126241ceae7b118d6a976fbba2c (patch)
tree04c9ec8836225500ee016354136598866d9db085 /config-model/src/main/java/com/yahoo
parent37925e563d403bdc2535a971757a6592bcb708d2 (diff)
Fetch flag value for architecture for admin clusters correctly
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
index 8bf6dc7f1d9..a6bcf6b0fd2 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java
@@ -36,7 +36,7 @@ import java.util.stream.IntStream;
*/
public class InMemoryProvisioner implements HostProvisioner {
- public static final NodeResources defaultResources = new NodeResources(1, 3, 10, 1);
+ public static final NodeResources defaultResources = new NodeResources(1, 3, 50, 1);
/**
* If this is true an exception is thrown when all nodes are used.
@@ -153,7 +153,7 @@ public class InMemoryProvisioner implements HostProvisioner {
if (alwaysReturnOneNode)
nodes = 1;
- int groups = requested.groups() > nodes ? nodes : requested.groups();
+ int groups = Math.min(requested.groups(), nodes);
List<HostSpec> allocation = new ArrayList<>();
if (groups == 1) {