Add zone field to NodeVersion

5 files changed, 25 insertions, 9 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java
index 088808f5942..d0e785198b1 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NodeVersionSerializer.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.persistence;
 
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
@@ -30,6 +31,7 @@ public class NodeVersionSerializer {
     //          - CHANGING THE FORMAT OF A FIELD: Don't do it bro.
 
     private static final String hostnameField = "hostname";
+    private static final String zoneField = "zone";
     private static final String currentVersionField = "currentVersion";
     private static final String wantedVersionField = "wantedVersion";
     private static final String changedAtField = "changedAt";
@@ -38,6 +40,7 @@ public class NodeVersionSerializer {
         for (var nodeVersion : nodeVersions) {
             var nodeVersionObject = array.addObject();
             nodeVersionObject.setString(hostnameField, nodeVersion.hostname().value());
+            nodeVersionObject.setString(zoneField, nodeVersion.zone().value());
             if (writeCurrentVersion) {
                 nodeVersionObject.setString(currentVersionField, nodeVersion.currentVersion().toFullString());
             }
@@ -50,10 +53,14 @@ public class NodeVersionSerializer {
         var nodeVersions = new ArrayList<NodeVersion>();
         object.traverse((ArrayTraverser) (i, entry) -> {
             var hostname = HostName.from(entry.field(hostnameField).asString());
+            // TODO(mpolden): Make non-optional after September 2019
+            var zone = Serializers.optionalString(entry.field(zoneField))
+                                  .map(ZoneId::from)
+                                  .orElseGet(ZoneId::defaultId);
             var currentVersion = version.orElseGet(() -> Version.fromString(entry.field(currentVersionField).asString()));
             var wantedVersion = Version.fromString(entry.field(wantedVersionField).asString());
             var changedAt = Instant.ofEpochMilli(entry.field(changedAtField).asLong());
-            nodeVersions.add(new NodeVersion(hostname, currentVersion, wantedVersion, changedAt));
+            nodeVersions.add(new NodeVersion(hostname, zone, currentVersion, wantedVersion, changedAt));
         });
         return Collections.unmodifiableList(nodeVersions);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
index 0a690b90410..5e463e04322 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/NodeVersion.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.versions;
 
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.config.provision.zone.ZoneId;
 
 import java.time.Instant;
 import java.util.Objects;
@@ -17,12 +18,14 @@ import java.util.Objects;
 public class NodeVersion {
 
     private final HostName hostname;
+    private final ZoneId zone;
     private final Version currentVersion;
     private final Version wantedVersion;
     private final Instant changedAt;
 
-    public NodeVersion(HostName hostname, Version currentVersion, Version wantedVersion, Instant changedAt) {
+    public NodeVersion(HostName hostname, ZoneId zone, Version currentVersion, Version wantedVersion, Instant changedAt) {
         this.hostname = Objects.requireNonNull(hostname, "hostname must be non-null");
+        this.zone = Objects.requireNonNull(zone, "zone must be non-null");
         this.currentVersion = Objects.requireNonNull(currentVersion, "version must be non-null");
         this.wantedVersion = Objects.requireNonNull(wantedVersion, "wantedVersion must be non-null");
         this.changedAt = Objects.requireNonNull(changedAt, "changedAt must be non-null");
@@ -33,6 +36,11 @@ public class NodeVersion {
         return hostname;
     }
 
+    /** Zone of this */
+    public ZoneId zone() {
+        return zone;
+    }
+
     /** Current version of this */
     public Version currentVersion() {
         return currentVersion;
@@ -56,13 +64,13 @@ public class NodeVersion {
     /** Returns a copy of this with current version set to given version */
     public NodeVersion withCurrentVersion(Version version, Instant changedAt) {
         if (currentVersion.equals(version)) return this;
-        return new NodeVersion(hostname, version, wantedVersion, changedAt);
+        return new NodeVersion(hostname, zone, version, wantedVersion, changedAt);
     }
 
     /** Returns a copy of this with wanted version set to given version */
     public NodeVersion withWantedVersion(Version version) {
         if (wantedVersion.equals(version)) return this;
-        return new NodeVersion(hostname, currentVersion, version, changedAt);
+        return new NodeVersion(hostname, zone, currentVersion, version, changedAt);
     }
 
     @Override
@@ -87,7 +95,7 @@ public class NodeVersion {
     }
 
     public static NodeVersion empty(HostName hostname) {
-        return new NodeVersion(hostname, Version.emptyVersion, Version.emptyVersion, Instant.EPOCH);
+        return new NodeVersion(hostname, ZoneId.defaultId(), Version.emptyVersion, Version.emptyVersion, Instant.EPOCH);
     }
 
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
index bb43ec20234..ab445de5a7f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java
@@ -172,7 +172,7 @@ public class VersionStatus {
                 for (var node : nodes) {
                     // Only use current node version if config has converged
                     Version version = configConverged ? node.currentVersion() : controller.systemVersion();
-                    newNodeVersions.add(new NodeVersion(node.hostname(), version, node.wantedVersion(), now));
+                    newNodeVersions.add(new NodeVersion(node.hostname(), zone.getId(), version, node.wantedVersion(), now));
                 }
             }
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
index 5d65cf0381e..dd66f52561f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.controller.persistence;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.config.SlimeUtils;
 import com.yahoo.vespa.hosted.controller.versions.DeploymentStatistics;
 import com.yahoo.vespa.hosted.controller.versions.NodeVersion;
@@ -97,7 +98,7 @@ public class VersionStatusSerializerTest {
     private static NodeVersions nodeVersions(Version version, Version wantedVersion, Instant changedAt, String... hostnames) {
         var nodeVersions = new ArrayList<NodeVersion>();
         for (var hostname : hostnames) {
-            nodeVersions.add(new NodeVersion(HostName.from(hostname), version, wantedVersion, changedAt));
+            nodeVersions.add(new NodeVersion(HostName.from(hostname), ZoneId.from("prod", "us-north-1"), version, wantedVersion, changedAt));
         }
         return NodeVersions.EMPTY.with(nodeVersions);
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
index 0a4d046e318..bb1e6b6256a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
@@ -76,8 +76,8 @@ public class DeploymentApiTest extends ControllerContainerTest {
                                            version.isControllerVersion(),
                                            version.isSystemVersion(),
                                            version.isReleased(),
-                                           NodeVersions.EMPTY.with(List.of(new NodeVersion(HostName.from("config1.test"), version.versionNumber(), version.versionNumber(), Instant.EPOCH),
-                                                                           new NodeVersion(HostName.from("config2.test"), version.versionNumber(), version.versionNumber(), Instant.EPOCH))),
+                                           NodeVersions.EMPTY.with(List.of(new NodeVersion(HostName.from("config1.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Instant.EPOCH),
+                                                                           new NodeVersion(HostName.from("config2.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Instant.EPOCH))),
                                            VespaVersion.confidenceFrom(version.statistics(), controller)
                 );
             }