From f2d29ef2a3fd4d39f1d3b8e4a9ba3e823f7ff319 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Tue, 11 Jan 2022 10:04:53 +0100 Subject: Add version target toString --- .../yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java | 2 +- .../yahoo/vespa/hosted/controller/versions/VespaVersionTarget.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java index 99ab6d420cb..8d5851be62f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java @@ -34,7 +34,7 @@ public class SystemUpgrader extends InfrastructureUpgrader { @Override protected void upgrade(VespaVersionTarget target, SystemApplication application, ZoneApi zone) { - log.info(Text.format("Deploying %s version %s in %s", application.id(), target, zone.getId())); + log.info(Text.format("Deploying %s on %s in %s", application.id(), target, zone.getId())); controller().applications().deploy(application, zone.getId(), target.version(), target.downgrade()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersionTarget.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersionTarget.java index fd5603b96b8..78d6d0ebf29 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersionTarget.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VespaVersionTarget.java @@ -30,4 +30,9 @@ public class VespaVersionTarget implements VersionTarget { return downgrade; } + @Override + public String toString() { + return "vespa version target " + version.toFullString() + (downgrade ? " (downgrade)" : ""); + } + } -- cgit v1.2.3