diff options
author | gjoranv <gjoranv@gmail.com> | 2019-03-22 10:30:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-22 10:30:16 +0100 |
commit | a05b9e83ee198a2dda97806eb388ab515b7094c1 (patch) | |
tree | f8390f9f2596821ab04d7cdced70e539f6cc438c | |
parent | 46929cb27005d49f0d37196967f62fbbab8a00c8 (diff) | |
parent | a2a9e43ac40bcb4f16f82d57d29d80a6cf9fa830 (diff) |
Merge pull request #8866 from vespa-engine/gjoranv/remove-index
Use 'index' from super class. (MERGEOK)
3 files changed, 4 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java index 88196e5ac4f..61a42d1c1a6 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java @@ -37,7 +37,7 @@ public class ClusterControllerCluster extends AbstractConfigProducer<ClusterCont for (ClusterControllerContainer container : containerCluster.getContainers()) { ZookeeperServerConfig.Server.Builder serverBuilder = new ZookeeperServerConfig.Server.Builder(); serverBuilder.hostname(container.getHostName()); - serverBuilder.id(container.getIndex()); + serverBuilder.id(container.index()); builder.server(serverBuilder); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java index 7c08f386e94..46acdb44746 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java @@ -32,13 +32,11 @@ public class ClusterControllerContainer extends Container implements { private static final ComponentSpecification CLUSTERCONTROLLER_BUNDLE = new ComponentSpecification("clustercontroller-apps"); private static final ComponentSpecification ZKFACADE_BUNDLE = new ComponentSpecification("zkfacade"); - private final int index; private final Set<String> bundles = new TreeSet<>(); public ClusterControllerContainer(AbstractConfigProducer parent, int index, boolean runStandaloneZooKeeper, boolean isHosted) { super(parent, "" + index, index); - this.index = index; addHandler( new Handler(new ComponentModel(new BundleInstantiationSpecification( new ComponentSpecification("clustercontroller-status"), @@ -80,7 +78,7 @@ public class ClusterControllerContainer extends Container implements @Override public boolean requiresWantedPort() { - return index == 0; + return index() == 0; } @Override @@ -107,7 +105,7 @@ public class ClusterControllerContainer extends Container implements @Override public void getConfig(ZookeeperServerConfig.Builder builder) { - builder.myid(index); + builder.myid(index()); } @Override @@ -115,7 +113,4 @@ public class ClusterControllerContainer extends Container implements builder.jvm(new QrStartConfig.Jvm.Builder().heapsize(512)); } - int getIndex() { - return index; - } } 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 74fcd57aa4d..5df50fa7ac7 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 @@ -134,7 +134,7 @@ public abstract class Container extends AbstractService implements } /** Returns the index of this node. The index of a given node is stable through changes with best effort. */ - public int index() { return index; } + public final int index() { return index; } // We cannot set bindings yet, as baseport is not initialized public void addBuiltinHandlers() { } |