Merge pull request #18746 from vespa-engine/hmusum/stop-distributing-files-when-building-model

Stop sending hints about files that should be downloaded when doing p… [run-systemtest]

5 files changed, 3 insertions, 35 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index dedd9e08655..61debbd055c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -127,7 +127,6 @@ public class SessionPreparer {
                 preparation.writeEndpointCertificateMetadataZK();
                 preparation.writeContainerEndpointsZK();
                 preparation.writeApplicationRoles();
-                preparation.distribute();
             }
             log.log(Level.FINE, () -> "time used " + params.getTimeoutBudget().timesUsed() + " : " + applicationId);
             return preparation.result();
@@ -298,12 +297,6 @@ public class SessionPreparer {
             checkTimeout("write application roles to zookeeper");
         }
 
-        void distribute() {
-            prepareResult.asList().forEach(modelResult -> modelResult.model
-                                           .distributeFiles(modelResult.fileDistributionProvider.getFileDistribution()));
-            checkTimeout("distribute files");
-        }
-
         PrepareResult result() {
             return prepareResult;
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
index ed12f4dbbe1..e0610d119db 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelStub.java
@@ -3,12 +3,10 @@ package com.yahoo.vespa.config.server;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.FileReference;
-import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.vespa.config.ConfigKey;
-import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 
 import java.util.Collection;
@@ -41,9 +39,6 @@ public class ModelStub implements Model {
     }
 
     @Override
-    public void distributeFiles(FileDistribution fileDistribution) { }
-
-    @Override
     public Set<FileReference> fileReferences() { return new HashSet<>(); }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
index 7e57eea74d6..2093a5bbb7c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/MockModel.java
@@ -3,15 +3,13 @@ package com.yahoo.vespa.config.server.application;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.FileReference;
-import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.api.PortInfo;
 import com.yahoo.config.model.api.ServiceInfo;
-import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.AllocatedHosts;
+import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.vespa.config.ConfigKey;
-import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 
 import java.util.Arrays;
@@ -94,11 +92,6 @@ public class MockModel implements Model {
     }
 
     @Override
-    public void distributeFiles(FileDistribution fileDistribution) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
     public Set<FileReference> fileReferences() { return new HashSet<>(); }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java
index 865d3b71b6e..938b43dfa78 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/DeploymentMetricsRetrieverTest.java
@@ -3,14 +3,12 @@ package com.yahoo.vespa.config.server.metrics;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.FileReference;
-import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.config.ConfigKey;
-import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 import com.yahoo.vespa.config.server.application.Application;
 import org.junit.Test;
@@ -104,11 +102,6 @@ public class DeploymentMetricsRetrieverTest {
         }
 
         @Override
-        public void distributeFiles(FileDistribution fileDistribution) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
         public Set<FileReference> fileReferences() { return new HashSet<>(); }
 
         @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java
index 0aad2f1ee26..3b39d9162ef 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java
@@ -3,16 +3,16 @@ package com.yahoo.vespa.config.server.metrics;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.FileReference;
-import com.yahoo.config.model.api.FileDistribution;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.config.ConfigKey;
-import com.yahoo.vespa.config.ConfigPayload;
 import com.yahoo.vespa.config.buildergen.ConfigDefinition;
 import com.yahoo.vespa.config.server.application.Application;
+import org.junit.Test;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,7 +20,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
@@ -98,11 +97,6 @@ public class ProtonMetricsRetrieverTest {
         }
 
         @Override
-        public void distributeFiles(FileDistribution fileDistribution) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
         public Set<FileReference> fileReferences() { return new HashSet<>(); }
 
         @Override