diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-07-07 13:13:56 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-07-07 13:13:56 +0200 |
commit | 954ed0a3a766edf7f05bcf1ee9710a44a7b52551 (patch) | |
tree | 9aee5d5ebcd80f780f1771fcc4cc02d2cc8b1b23 | |
parent | 057160f29b1096eabf010fd2742e9a24d44f86f5 (diff) |
Rename method
3 files changed, 5 insertions, 5 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 65f4c851e3c..a635d512054 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 @@ -200,8 +200,8 @@ public class RoutingController { return EndpointList.copyOf(endpoints); } - /** Read test runner endpoints for given deployments, grouped by their zone */ - public Map<ZoneId, List<Endpoint>> readTestRunnerEndpointsOf(Collection<DeploymentId> deployments) { + /** Read endpoints for use in deployment steps, for given deployments, grouped by their zone */ + public Map<ZoneId, List<Endpoint>> readStepRunnerEndpointsOf(Collection<DeploymentId> deployments) { TreeMap<ZoneId, List<Endpoint>> endpoints = new TreeMap<>(Comparator.comparing(ZoneId::value)); for (var deployment : deployments) { EndpointList zoneEndpoints = readEndpointsOf(deployment).scope(Endpoint.Scope.zone) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index e19915fbd24..07695c17042 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -502,7 +502,7 @@ public class InternalStepRunner implements StepRunner { private Availability endpointsAvailable(ApplicationId id, ZoneId zone, Deployment deployment, DualLogger logger) { DeploymentId deploymentId = new DeploymentId(id, zone); - Map<ZoneId, List<Endpoint>> endpoints = controller.routing().readTestRunnerEndpointsOf(Set.of(deploymentId)); + Map<ZoneId, List<Endpoint>> endpoints = controller.routing().readStepRunnerEndpointsOf(Set.of(deploymentId)); logEndpoints(endpoints, logger); DeploymentRoutingContext context = controller.routing().of(deploymentId); boolean resolveEndpoints = context.routingMethod() == RoutingMethod.exclusive; @@ -594,7 +594,7 @@ public class InternalStepRunner implements StepRunner { deployments.add(new DeploymentId(id.application(), zoneId)); logger.log("Attempting to find endpoints ..."); - var endpoints = controller.routing().readTestRunnerEndpointsOf(deployments); + var endpoints = controller.routing().readStepRunnerEndpointsOf(deployments); if ( ! endpoints.containsKey(zoneId)) { logger.log(WARNING, "Endpoints for the deployment to test vanished again, while it was still active!"); return Optional.of(error); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 5d9ef597396..b055157fc84 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -2692,7 +2692,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { deployment.version(), deployment.revision(), deployment.at(), - controller.routing().readTestRunnerEndpointsOf(deployments), + controller.routing().readStepRunnerEndpointsOf(deployments), controller.applications().reachableContentClustersByZone(deployments))); } |