GC confusing and void ClusterConfig.clusterId

2 files changed, 4 insertions, 10 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index cb5ac7a6a4f..4ea9facc138 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -80,7 +80,6 @@ public class ClusterSearcher extends Searcher {
         super(id);
         this.executor = executor;
         this.schemaInfo = schemaInfo;
-        int searchClusterIndex = clusterConfig.clusterId();
         searchClusterName = clusterConfig.clusterName();
         this.globalPhaseRanker = globalPhaseRanker;
         schema2Searcher = new LinkedHashMap<>();
@@ -89,7 +88,7 @@ public class ClusterSearcher extends Searcher {
         maxQueryCacheTimeout = ParameterParser.asMilliSeconds(clusterConfig.maxQueryCacheTimeout(), DEFAULT_MAX_QUERY_CACHE_TIMEOUT);
 
         VespaBackend streaming = null, indexed = null;
-        ClusterParams clusterParams = makeClusterParams(searchClusterIndex, documentDbConfig, schemaInfo);
+        ClusterParams clusterParams = makeClusterParams(searchClusterName, documentDbConfig, schemaInfo);
         for (DocumentdbInfoConfig.Documentdb docDb : documentDbConfig.documentdb()) {
             if (docDb.mode() == DocumentdbInfoConfig.Documentdb.Mode.Enum.INDEX) {
                 if (indexed == null) {
@@ -106,9 +105,9 @@ public class ClusterSearcher extends Searcher {
         }
     }
 
-    private static ClusterParams makeClusterParams(int searchclusterIndex, DocumentdbInfoConfig documentDbConfig, SchemaInfo schemaInfo)
+    private static ClusterParams makeClusterParams(String searchclusterName, DocumentdbInfoConfig documentDbConfig, SchemaInfo schemaInfo)
     {
-        return new ClusterParams("sc" + searchclusterIndex + ".num" + 0, UUID.randomUUID().toString(),
+        return new ClusterParams(searchclusterName + ".num" + 0, UUID.randomUUID().toString(),
                                  null, documentDbConfig, schemaInfo);
     }
 
diff --git a/container-search/src/main/resources/configdefinitions/search.config.cluster.def b/container-search/src/main/resources/configdefinitions/search.config.cluster.def
index ac88d5baa24..efa4a261546 100644
--- a/container-search/src/main/resources/configdefinitions/search.config.cluster.def
+++ b/container-search/src/main/resources/configdefinitions/search.config.cluster.def
@@ -1,13 +1,8 @@
 # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 namespace=search.config
 
-#The id of the cluster (as specified in qr-searchers)
-#Note: Use clusterName where possible instead
-clusterId int default=0
-
 #Timeout for internal searcher cache. Entries older than this number
-#of seconds will be removed from cache. 0 or less means the cache is
-#disabled.
+#of seconds will be removed from cache. 0 or less means the cache is disabled.
 cacheTimeout double default=0
 
 #The name of the cluster (as specified in qr-searchers)