diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-01-11 10:19:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-11 10:19:05 +0100 |
commit | 125b87cbfb5d71948155ae2580111b30014fd188 (patch) | |
tree | dfed4a5cffadbd9be5b605df77307c335e2da774 | |
parent | bc60b11563a167ccdfe2d04ba97285a53bab4e48 (diff) | |
parent | f2d29ef2a3fd4d39f1d3b8e4a9ba3e823f7ff319 (diff) |
Merge pull request #20747 from vespa-engine/mpolden/add-tostring
Add version target toString
2 files changed, 6 insertions, 1 deletions
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<VespaVersionTarget> { @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)" : ""); + } + } |