diff options
4 files changed, 9 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java index 544822e3be3..8f37d287c1a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java @@ -133,10 +133,10 @@ public class Endpoint { return routingMethod.isShared() && scope == Scope.global; } - /** Returns the upstream ID of given deployment. This *must* match what the routing layer generates */ - public String upstreamIdOf(DeploymentId deployment) { + /** Returns the upstream name of given deployment. This *must* match what the routing layer generates */ + public String upstreamName(DeploymentId deployment) { if (!routingMethod.isShared()) throw new IllegalArgumentException("Routing method " + routingMethod + " does not have upstream name"); - return upstreamIdOf(cluster.value(), deployment.applicationId(), deployment.zoneId()); + return upstreamName(cluster.value(), deployment.applicationId(), deployment.zoneId()); } @Override @@ -269,7 +269,7 @@ public class Endpoint { return suffix; } - private static String upstreamIdOf(String name, ApplicationId application, ZoneId zone) { + private static String upstreamName(String name, ApplicationId application, ZoneId zone) { return Stream.of(namePart(name, ""), instancePart(Optional.of(application.instance()), ""), application.application().value(), 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 ed16c86c94e..cf85d862041 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 @@ -1555,7 +1555,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { if (primaryEndpoint.isPresent()) { DeploymentRoutingContext context = controller.routing().of(deploymentId); RoutingStatus status = context.routingStatus(); - array.addString(primaryEndpoint.get().upstreamIdOf(deploymentId)); + array.addString(primaryEndpoint.get().upstreamName(deploymentId)); Cursor statusObject = array.addObject(); statusObject.setString("status", status.value().name()); statusObject.setString("reason", ""); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java index 6fd8a3a84d5..569c767d302 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java @@ -88,7 +88,7 @@ public abstract class DeploymentRoutingContext implements RoutingContext { clock.instant().getEpochSecond()); primaryEndpoint().ifPresent(endpoint -> { try { - configServer.setGlobalRotationStatus(deployment, endpoint.upstreamIdOf(deployment), newStatus); + configServer.setGlobalRotationStatus(deployment, endpoint.upstreamName(deployment), newStatus); } catch (Exception e) { throw new RuntimeException("Failed to set rotation status of " + endpoint + " in " + deployment, e); } @@ -98,7 +98,7 @@ public abstract class DeploymentRoutingContext implements RoutingContext { @Override public RoutingStatus routingStatus() { Optional<EndpointStatus> status = primaryEndpoint().map(endpoint -> { - var upstreamName = endpoint.upstreamIdOf(deployment); + var upstreamName = endpoint.upstreamName(deployment); return configServer.getGlobalRotationStatus(deployment, upstreamName); }); if (status.isEmpty()) return RoutingStatus.DEFAULT; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java index 46d27911de4..e50c32d0e5d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/EndpointTest.java @@ -387,8 +387,8 @@ public class EndpointTest { "c2.i2.a2.t2.us-north-1.prod", Endpoint.of(instance2).target(EndpointId.of("ignored2"), ClusterSpec.Id.from("c2"), List.of(zone2)).on(Port.tls(4443)).in(SystemName.main) ); - tests1.forEach((expected, endpoint) -> assertEquals(expected, endpoint.upstreamIdOf(zone))); - tests2.forEach((expected, endpoint) -> assertEquals(expected, endpoint.upstreamIdOf(zone2))); + tests1.forEach((expected, endpoint) -> assertEquals(expected, endpoint.upstreamName(zone))); + tests2.forEach((expected, endpoint) -> assertEquals(expected, endpoint.upstreamName(zone2))); } } |