summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-07-04 13:18:35 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-07-04 13:18:35 +0200
commite3227366589eb7266ee977d5019e898950cc0065 (patch)
tree06aedc35fe31f87d1c2579559ec26cc76ecc0818
parent67d1320dfddee7415ab62c4c09ec049afb4f1485 (diff)
Add clusterid
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/Container.java1
-rw-r--r--configdefinitions/src/vespa/cluster-member-info.def4
2 files changed, 5 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index f9ab17b359e..9a2c631a17b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -381,6 +381,7 @@ public class Container extends AbstractService implements
@Override
public void getConfig(ClusterMemberInfoConfig.Builder builder) {
+ builder.clusterId(clusterName);
builder.index(index);
}
diff --git a/configdefinitions/src/vespa/cluster-member-info.def b/configdefinitions/src/vespa/cluster-member-info.def
index 15781772ee5..7c94a339bd1 100644
--- a/configdefinitions/src/vespa/cluster-member-info.def
+++ b/configdefinitions/src/vespa/cluster-member-info.def
@@ -2,8 +2,12 @@
# Information about a given node's (the node receiving the config) membership in a cluster. See also cluster-info
namespace=cloud.config
+# the id of the cluster this node is a member of
+clusterId string
+
# The unique index of this node in the cluster.
# Node indexes are not necessarily continuous and starting at zero.
index int
+