diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-09-21 15:20:53 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-09-21 15:25:34 +0200 |
commit | c961e1eb4876c4015223e988c16305923e62e864 (patch) | |
tree | 9b702b9b334a2671464bfb42badcc43c2519a945 | |
parent | fdc07202b6f67500a7d868e8d3da6e3bd57f4f0f (diff) |
Rename method
3 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index 3fc0a019a47..b50915253fb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -134,7 +134,7 @@ public class RoutingController { // Add zone-scoped endpoints Map<EndpointId, GeneratedEndpointList> generatedForDeclaredEndpoints = new HashMap<>(); Set<ClusterSpec.Id> clustersWithToken = new HashSet<>(); - boolean generatedEndpointsEnabled = randomizedEndpointsEnabled(deployment.applicationId()); + boolean generatedEndpointsEnabled = generatedEndpointsEnabled(deployment.applicationId()); RoutingPolicyList applicationPolicies = policies().read(TenantAndApplicationId.from(deployment.applicationId())); RoutingPolicyList deploymentPolicies = applicationPolicies.deployment(deployment); for (var container : services.containers()) { @@ -520,7 +520,7 @@ public class RoutingController { return Collections.unmodifiableList(routingMethods); } - public boolean randomizedEndpointsEnabled(ApplicationId instance) { + public boolean generatedEndpointsEnabled(ApplicationId instance) { return randomizedEndpoints.with(FetchVector.Dimension.APPLICATION_ID, instance.serializedForm()).value(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java index b1cadcc341c..b16d09f974f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificates.java @@ -155,7 +155,7 @@ public class EndpointCertificates { } private Optional<EndpointCertificate> getOrProvision(Instance instance, ZoneId zone, DeploymentSpec deploymentSpec) { - if (controller.routing().randomizedEndpointsEnabled(instance.id())) { + if (controller.routing().generatedEndpointsEnabled(instance.id())) { return Optional.of(assignFromPool(instance, zone)); } Optional<AssignedCertificate> assignedCertificate = curator.readAssignedCertificate(TenantAndApplicationId.from(instance.id()), Optional.of(instance.id().instance())); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java index 6c7ee4d0d85..2835c36c320 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/certificate/EndpointCertificatesHandler.java @@ -73,7 +73,7 @@ public class EndpointCertificatesHandler extends ThreadedHttpRequestHandler { public StringResponse reRequestEndpointCertificateFor(String instanceId, boolean ignoreExisting) { ApplicationId applicationId = ApplicationId.fromFullString(instanceId); - if (controller.routing().randomizedEndpointsEnabled(applicationId)) { + if (controller.routing().generatedEndpointsEnabled(applicationId)) { throw new IllegalArgumentException("Cannot re-request certificate. " + instanceId + " is assigned certificate from a pool"); } try (var lock = curator.lock(TenantAndApplicationId.from(applicationId))) { |