From 3313221356f6d06bae1a85d20abbedde22db0914 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 4 Jul 2017 10:46:35 +0200 Subject: Allow nodes to know their index --- .../main/java/com/yahoo/vespa/model/container/Container.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'config-model/src') 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 fd3fe4e3740..f9ab17b359e 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 @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container; +import com.yahoo.cloud.config.ClusterMemberInfoConfig; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.config.model.producer.AbstractConfigProducer; @@ -48,7 +49,8 @@ public class Container extends AbstractService implements ComponentsConfig.Producer, JdiscBindingsConfig.Producer, ContainerHttpConfig.Producer, - ContainerMbusConfig.Producer { + ContainerMbusConfig.Producer, + ClusterMemberInfoConfig.Producer { public static final int BASEPORT = Defaults.getDefaults().vespaWebServicePort(); public static final String SINGLENODE_CONTAINER_SERVICESPEC = "default_singlenode_container"; @@ -65,7 +67,7 @@ public class Container extends AbstractService implements /** Whether this node has been marked as retired (e.g, will be removed) */ private final boolean retired; - /** The index of this node. Non-critical: This is persisted on hosted, just a counter otherwise. */ + /** The unique index of this node */ private final int index; private final ComponentGroup> handlers = new ComponentGroup<>(this, "handler"); @@ -377,6 +379,11 @@ public class Container extends AbstractService implements builder.enabled(messageBusEnabled).port(getMessagingPort()); } + @Override + public void getConfig(ClusterMemberInfoConfig.Builder builder) { + builder.index(index); + } + @Override public HashMap getDefaultMetricDimensions(){ HashMap dimensions = new HashMap<>(); -- cgit v1.2.3