Remove unnecessary code for producing filedistributorrpc config

Config value is always the same for a node, make it simple

10 files changed, 3 insertions, 113 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
index fe61f8ac1a4..d9d7dd9eaf0 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ApplicationConfigProducerRoot.java
@@ -34,7 +34,6 @@ import com.yahoo.vespa.model.Service;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
 import com.yahoo.vespa.model.routing.Routing;
 
 import java.util.ArrayList;
@@ -285,11 +284,6 @@ public class ApplicationConfigProducerRoot extends TreeConfigProducer<AnyConfigP
         return hostSystem;
     }
 
-    public FileDistributionConfigProducer getFileDistributionConfigProducer() {
-        if (admin == null) return null; // no admin if standalone
-        return admin.getFileDistributionConfigProducer();
-    }
-
     public Admin getAdmin() {
         return admin;
     }
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducerRoot.java
index 84a718d02ed..d844fed1609 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducerRoot.java
@@ -5,7 +5,6 @@ import com.yahoo.config.model.ConfigModelRepo;
 import com.yahoo.vespa.model.ConfigProducer;
 import com.yahoo.vespa.model.ConfigProducerRoot;
 import com.yahoo.vespa.model.Service;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -29,8 +28,6 @@ public abstract class AbstractConfigProducerRoot extends TreeConfigProducer<AnyC
         return this;
     }
 
-    public abstract FileDistributionConfigProducer getFileDistributionConfigProducer();
-
     /**
      * Freezes the parent - child connections of the model
      * and sets information derived from the topology.
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
index b6779f8666c..61c904fbc1d 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
@@ -11,11 +11,9 @@ import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
 import com.yahoo.vespa.model.ConfigProducer;
 import com.yahoo.vespa.model.HostSystem;
 import com.yahoo.vespa.model.admin.Admin;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
 import java.util.Collections;
 import java.util.Set;
 
-
 /**
  * Use for testing. Use as parent for the config producer(s) you want to test, to test
  * only a subtree of the producers.
@@ -44,10 +42,6 @@ public class MockRoot extends AbstractConfigProducerRoot {
         this.deployState = deployState;
     }
 
-    public FileDistributionConfigProducer getFileDistributionConfigProducer() {
-        return null;
-    }
-
     @Override
     public ConfigModelRepo configModelRepo() {
         return new ConfigModelRepo();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
index 350d59b7369..a109fb9b9dc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java
@@ -50,7 +50,6 @@ import com.yahoo.vespa.model.container.ContainerModel;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.vespa.model.content.Content;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
 import com.yahoo.vespa.model.ml.ConvertedModel;
 import com.yahoo.vespa.model.ml.ModelName;
 import com.yahoo.vespa.model.ml.OnnxModelInfo;
@@ -633,10 +632,6 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Mode
         return configModelRepo.getRouting();
     }
 
-    public FileDistributionConfigProducer getFileDistributionConfigProducer() {
-        return root.getFileDistributionConfigProducer();
-    }
-
     /** Returns an unmodifiable view of the mapping of config id to {@link ConfigProducer} */
     public Map<String, ConfigProducer> id2producer() {
         return Collections.unmodifiableMap(id2producer);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 90316c3d1e1..f7d44627238 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -24,8 +24,6 @@ import com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyContainerCluster;
 import com.yahoo.vespa.model.admin.monitoring.MetricsConsumer;
 import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProvider;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -82,7 +80,6 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri
     private Optional<LogserverContainerCluster> logServerContainerCluster = Optional.empty();
 
     private ZooKeepersConfigProvider zooKeepersConfigProvider;
-    private final FileDistributionConfigProducer fileDistribution;
     private final boolean multitenant;
 
     public Admin(TreeConfigProducer<AnyConfigProducer> parent,
@@ -96,7 +93,6 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri
         this.monitoring = monitoring;
         this.metrics = metrics;
         this.multitenant = multitenant;
-        this.fileDistribution = new FileDistributionConfigProducer(parent);
         this.applicationType = applicationType;
         this.logctlSpecs.addAll(defaultLogctlSpecs());
     }
@@ -221,10 +217,6 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri
         zooKeepersConfigProvider.getConfig(builder);
     }
 
-    public FileDistributionConfigProducer getFileDistributionConfigProducer() {
-        return fileDistribution;
-    }
-
     /**
      * Adds services to all hosts in the system.
      */
@@ -258,7 +250,6 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri
         addConfigSentinel(deployState, host);
         addLogd(deployState, host);
         addConfigProxy(deployState, host);
-        addFileDistribution(host);
         if (logForwarderConfig != null) {
             boolean actuallyAdd = true;
             var membership = host.spec().membership();
@@ -299,11 +290,6 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri
         service.initService(deployState);
     }
 
-    private void addFileDistribution(HostResource host) {
-        var configProvider = new FileDistributionConfigProvider(fileDistribution, host.getHost());
-        fileDistribution.addProvider(host.getHost(), configProvider);
-    }
-
     // If not configured by user: Use default setup: max 3 slobroks, 1 on the default configserver host
     private List<Slobrok> createDefaultSlobrokSetup(DeployState deployState) {
         List<HostResource> hosts = hostSystem().getHosts();
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 4e3b3d1d8cb..8d23c0a9d59 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
@@ -28,7 +28,6 @@ import com.yahoo.vespa.model.container.component.SimpleComponent;
 import com.yahoo.vespa.model.container.http.ConnectorFactory;
 import com.yahoo.vespa.model.container.http.Http;
 import com.yahoo.vespa.model.container.http.JettyHttpServer;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -39,7 +38,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import static com.yahoo.container.QrConfig.Filedistributor;
 import static com.yahoo.container.QrConfig.Rpc;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 
@@ -316,7 +314,6 @@ public abstract class Container extends AbstractService implements
                             .enabled(rpcServerEnabled())
                             .port(getRpcPort())
                             .slobrokId(serviceSlobrokId()))
-                .filedistributor(filedistributorConfig())
                 .discriminator((clusterName != null ? clusterName + "." : "" ) + name)
                 .clustername(clusterName != null ? clusterName : "")
                 .nodeIndex(index)
@@ -331,16 +328,6 @@ public abstract class Container extends AbstractService implements
         return "vespa/service/" + getConfigId();
     }
 
-    private Filedistributor.Builder filedistributorConfig() {
-        Filedistributor.Builder builder = new Filedistributor.Builder();
-
-        FileDistributionConfigProducer fileDistribution = getRoot().getFileDistributionConfigProducer();
-        if (fileDistribution != null) {
-            builder.configid(fileDistribution.getConfigProducer(getHost().getHost()).getConfigId());
-        }
-        return builder;
-    }
-
     @Override
     public void getConfig(ComponentsConfig.Builder builder) {
         builder.setApplyOnRestart(owner.getDeferChangesUntilRestart()); //  Sufficient to set on one config
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
deleted file mode 100644
index 631295ed345..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProducer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.filedistribution;
-
-import com.yahoo.config.model.producer.AnyConfigProducer;
-import com.yahoo.config.model.producer.TreeConfigProducer;
-import com.yahoo.vespa.model.Host;
-
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-/**
- * File distribution config producer, delegates getting config to {@link FileDistributionConfigProvider} (one per host)
- *
- * @author hmusum
- */
-public class FileDistributionConfigProducer extends TreeConfigProducer<FileDistributionConfigProvider> {
-
-    private final Map<Host, FileDistributionConfigProvider> fileDistributionConfigProviders = new IdentityHashMap<>();
-
-    public FileDistributionConfigProducer(TreeConfigProducer<AnyConfigProducer> parent) {
-        super(parent, "filedistribution");
-    }
-
-    public void addProvider(Host host, FileDistributionConfigProvider fileDistributionConfigProvider) {
-        fileDistributionConfigProviders.put(host, fileDistributionConfigProvider);
-    }
-
-    public FileDistributionConfigProvider getConfigProducer(Host host) {
-        return fileDistributionConfigProviders.get(host);
-    }
-
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
deleted file mode 100644
index beb2d2f7f93..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/FileDistributionConfigProvider.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.filedistribution;
-
-import com.yahoo.cloud.config.filedistribution.FiledistributorrpcConfig;
-import com.yahoo.config.model.producer.AnyConfigProducer;
-import com.yahoo.config.model.producer.TreeConfigProducer;
-import com.yahoo.vespa.model.ConfigProxy;
-import com.yahoo.vespa.model.Host;
-
-public class FileDistributionConfigProvider extends AnyConfigProducer implements FiledistributorrpcConfig.Producer {
-
-    private final Host host;
-
-    public FileDistributionConfigProvider(FileDistributionConfigProducer parent, Host host) {
-        super(parent, host.getHostname());
-        this.host = host;
-    }
-
-    @Override
-    public void getConfig(FiledistributorrpcConfig.Builder builder) {
-        builder.connectionspec("tcp/" + host.getHostname() + ":" + ConfigProxy.BASEPORT);
-    }
-
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index c0f22da2982..dc4f9273868 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -15,6 +15,7 @@ import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.content.core.StorStatusConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.model.AbstractService;
+import com.yahoo.vespa.model.ConfigProxy;
 import com.yahoo.vespa.model.PortAllocBridge;
 import com.yahoo.vespa.model.admin.monitoring.Monitoring;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
@@ -22,8 +23,6 @@ import com.yahoo.vespa.model.builder.xml.dom.VespaDomBuilder;
 import com.yahoo.vespa.model.content.ContentNode;
 import com.yahoo.vespa.model.content.Redundancy;
 import com.yahoo.vespa.model.content.ResourceLimits;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProducer;
-import com.yahoo.vespa.model.filedistribution.FileDistributionConfigProvider;
 import org.w3c.dom.Element;
 
 import java.util.HashMap;
@@ -256,11 +255,7 @@ public class SearchNode extends AbstractService implements
 
     @Override
     public void getConfig(FiledistributorrpcConfig.Builder builder) {
-        FileDistributionConfigProducer fileDistribution = getRoot().getFileDistributionConfigProducer();
-        if (fileDistribution != null) {
-            FileDistributionConfigProvider configProducer = fileDistribution.getConfigProducer(getHost().getHost());
-            configProducer.getConfig(builder);
-        }
+        builder.connectionspec("tcp/" + getHostName() + ":" + ConfigProxy.BASEPORT);
     }
 
     @Override
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index e7ef1a65312..e704da08d18 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -36,7 +36,6 @@ import com.yahoo.container.handler.metrics.MetricsV2Handler;
 import com.yahoo.container.handler.observability.ApplicationStatusHandler;
 import com.yahoo.container.jdisc.JdiscBindingsConfig;
 import com.yahoo.container.usability.BindingsOverviewHandler;
-import com.yahoo.net.HostName;
 import com.yahoo.prelude.cluster.QrMonitorConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.AbstractService;
@@ -648,14 +647,13 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     @Test
     void qrconfig_is_produced() throws IOException, SAXException {
         QrConfig qr = getQrConfig(new TestProperties());
-        String hostname = HostName.getLocalhost();  // Using the same way of getting hostname as filedistribution model
         assertEquals("default.container.0", qr.discriminator());
         assertEquals(19102, qr.rpc().port());
         assertEquals("vespa/service/default/container.0", qr.rpc().slobrokId());
         assertTrue(qr.rpc().enabled());
         assertEquals("", qr.rpc().host());
         assertFalse(qr.restartOnDeploy());
-        assertEquals("filedistribution/" + hostname, qr.filedistributor().configid());
+        assertEquals("", qr.filedistributor().configid()); // Not used, will be removed in Vespa 9
         assertEquals(50.0, qr.shutdown().timeout(), 0.00000000000001);
         assertFalse(qr.shutdown().dumpHeapOnTimeout());
     }