diff options
2 files changed, 9 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java index fc2873318d9..609ee966c9b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java @@ -98,9 +98,10 @@ public class CapacityPolicies { Architecture architecture = adminClusterArchitecture(applicationId); if (nodeRepository.exclusiveAllocation(clusterSpec)) { - var resources = smallestExclusiveResources(); + var resources = smallestExclusiveResources(4); //TODO: use 8Gb as default when no apps are using 4Gb return versioned(clusterSpec, Map.of(new Version(0), resources, - new Version(8, 182, 12), resources.with(architecture))); + new Version(8, 182, 12), resources.with(architecture), + new Version(8, 187), smallestExclusiveResources(8).with(architecture))); } if (clusterSpec.id().value().equals("cluster-controllers")) { @@ -162,10 +163,10 @@ public class CapacityPolicies { } // The lowest amount of resources that can be exclusive allocated (i.e. a matching host flavor for this exists) - private NodeResources smallestExclusiveResources() { + private NodeResources smallestExclusiveResources(int memoryGb) { return (zone.cloud().name().equals(CloudName.GCP)) - ? new NodeResources(1, 4, 50, 0.3) - : new NodeResources(0.5, 4, 50, 0.3); + ? new NodeResources(1, memoryGb, 50, 0.3) + : new NodeResources(0.5, memoryGb, 50, 0.3); } // The lowest amount of resources that can be shared (i.e. a matching host flavor for this exists) diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java index 7eae86057d4..718cf790ab4 100644 --- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java +++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/EffectiveServicesMojo.java @@ -45,10 +45,11 @@ public class EffectiveServicesMojo extends AbstractVespaDeploymentMojo { ZoneId zone = zoneOf(environment, region); Path output = Paths.get(outputDirectory).resolve("services-" + zone.environment().value() + "-" + zone.region().value() + ".xml"); - Files.write(output, effectiveServices(services, zone, InstanceName.from(instance), Tags.fromString(tags)).getBytes(StandardCharsets.UTF_8)); + Tags tagz = Tags.fromString(tags); + Files.write(output, effectiveServices(services, zone, InstanceName.from(instance), tagz).getBytes(StandardCharsets.UTF_8)); getLog().info("Effective services for " + zone + ", instance " + instance + - ( tags.isEmpty() ? "" : ", tags " + tags ) + + ( tags == null ? "" : ", tags '" + tagz + "'") + " written to " + output); } |