diff options
4 files changed, 3 insertions, 12 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 322a1421fd4..e6bb7d9bdf5 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -122,7 +122,7 @@ public class Flags { "Takes effect on next iteration of HostProvisionMaintainer."); public static final UnboundBooleanFlag USE_ADVERTISED_RESOURCES = defineFeatureFlag( - "use-advertised-resources", false, + "use-advertised-resources", true, "When enabled, will use advertised host resources rather than actual host resources, ignore host resource " + "reservation, and fail with exception unless requested resource match advertised host resources exactly.", "Takes effect on next iteration of HostProvisionMaintainer.", diff --git a/flags/src/main/java/com/yahoo/vespa/flags/InMemoryFlagSource.java b/flags/src/main/java/com/yahoo/vespa/flags/InMemoryFlagSource.java index 6565ada98b0..3f3ab93009e 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/InMemoryFlagSource.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/InMemoryFlagSource.java @@ -41,12 +41,6 @@ public class InMemoryFlagSource implements FlagSource { return withRawFlag(flagId, new UnboundJacksonFlag<>(flagId, value, jacksonClass).serializer().serialize(value)); } - /** use {@link #withListFlag(FlagId, List, Class)} instead */ - @Deprecated - public InMemoryFlagSource withListFlag(FlagId flagId, List<String> value) { - return withListFlag(flagId, value, String.class); - } - public <T> InMemoryFlagSource withListFlag(FlagId flagId, List<T> value, Class<T> elementClass) { return withRawFlag(flagId, new UnboundListFlag<T>(flagId, value, elementClass).serializer().serialize(value)); } 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 ffbf311fc0f..5bc3703c11c 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 @@ -6,7 +6,6 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.flags.BooleanFlag; import com.yahoo.vespa.flags.FetchVector; import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.flags.Flags; @@ -24,12 +23,10 @@ import java.util.Optional; public class CapacityPolicies { private final Zone zone; - private final BooleanFlag useAdvertisedResourcesFlag; private final JacksonFlag<com.yahoo.vespa.flags.custom.NodeResources> defaultResourcesFlag; public CapacityPolicies(Zone zone, FlagSource flagSource) { this.zone = zone; - this.useAdvertisedResourcesFlag = Flags.USE_ADVERTISED_RESOURCES.bindTo(flagSource); this.defaultResourcesFlag = Flags.DEFAULT_RESOURCES.bindTo(flagSource); } @@ -58,7 +55,8 @@ public class CapacityPolicies { resources = resources.withDiskSpeed(NodeResources.DiskSpeed.any); // Dev does not cap the cpu of containers since usage is spotty: Allocate just a small amount exclusively - if (zone.environment() == Environment.dev && !useAdvertisedResourcesFlag.value()) + // Do not cap in AWS as hosts are allocated on demand and 1-to-1, so the node can use the entire host + if (zone.environment() == Environment.dev && !zone.region().value().contains("aws-")) resources = resources.withVcpu(0.1); return resources; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index 203f922d132..dee32513457 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -75,7 +75,6 @@ public class ProvisioningTester { private final CapacityPolicies capacityPolicies; private final ProvisionLogger provisionLogger; private final LoadBalancerServiceMock loadBalancerService; - private final InMemoryFlagSource flagSource = new InMemoryFlagSource(); private int nextHost = 0; private int nextIP = 0; |