From e9855a5c0af19b967de1f111963cfe3e8adb6a47 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 20 Apr 2021 12:50:43 +0200 Subject: No functional changes --- .../main/java/com/yahoo/vespa/model/content/StorageGroup.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java index 3c0f8996c22..fc4fddceb66 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java @@ -143,10 +143,10 @@ public class StorageGroup { } public int getNumberOfLeafGroups() { - int count = subgroups.isEmpty() ? 1 : 0; - for (StorageGroup g : subgroups) { + if (subgroups.isEmpty()) return 1; + int count = 0; + for (StorageGroup g : subgroups) count += g.getNumberOfLeafGroups(); - } return count; } @@ -393,7 +393,8 @@ public class StorageGroup { childAsString(groupElement, VespaDomBuilder.VESPAMALLOC_DEBUG), childAsString(groupElement, VespaDomBuilder.VESPAMALLOC_DEBUG_STACKTRACE)); - List subGroups = groupElement.isPresent() ? collectSubGroups(isHosted, group, groupElement.get()) : Collections.emptyList(); + List subGroups = groupElement.isPresent() ? collectSubGroups(isHosted, group, groupElement.get()) + : List.of(); List explicitNodes = new ArrayList<>(); explicitNodes.addAll(collectExplicitNodes(groupElement)); @@ -407,7 +408,7 @@ public class StorageGroup { nodeRequirement = Optional.of(NodesSpecification.from(nodesElement.get(), context)); else if (nodesElement.isPresent() && context.getDeployState().isHosted() && context.getDeployState().zone().environment().isManuallyDeployed() ) // default to 1 node nodeRequirement = Optional.of(NodesSpecification.from(nodesElement.get(), context)); - else if (! nodesElement.isPresent() && subGroups.isEmpty() && context.getDeployState().isHosted()) // request one node + else if (nodesElement.isEmpty() && subGroups.isEmpty() && context.getDeployState().isHosted()) // request one node nodeRequirement = Optional.of(NodesSpecification.nonDedicated(1, context)); else // Nodes or groups explicitly listed - resolve in GroupBuilder nodeRequirement = Optional.empty(); -- cgit v1.2.3