diff options
author | gjoranv <gv@verizonmedia.com> | 2021-10-04 10:41:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-04 10:41:10 +0200 |
commit | ba2347b6c4733fbddca32989dae65c0ce8ef939a (patch) | |
tree | 0618163fe8125d88a450cbac0f9ec9ca09184032 /config-model/src | |
parent | 7371274583e76a1b4ba2a0d9ba001048c58d38de (diff) | |
parent | c8c404b9de976e7e874f500be46d1268e696cf6d (diff) |
Merge pull request #19404 from vespa-engine/add-node-indices-to-zone-api
Expose node indices of a container cluster via SystemInfo
Diffstat (limited to 'config-model/src')
-rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 1 | ||||
-rwxr-xr-x | config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index d05650b10b5..69bcd4b87bb 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -555,6 +555,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> public void getConfig(ClusterInfoConfig.Builder builder) { builder.clusterId(name); builder.nodeCount(containers.size()); + containers.forEach(c -> builder.nodeIndices(c.index())); for (Service service : getDescendantServices()) { builder.services.add(new ClusterInfoConfig.Services.Builder() diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 7b5efad9647..6f575ef7ea3 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -56,6 +56,7 @@ public class ContainerClusterTest { ClusterInfoConfig config = getClusterInfoConfig(cluster); assertEquals("name", config.clusterId()); assertEquals(2, config.nodeCount()); + assertEquals(List.of(0, 0), config.nodeIndices()); // both containers are created with index 0 assertEquals(2, config.services().size()); Iterator<ClusterInfoConfig.Services> iterator = config.services().iterator(); |