Merge pull request #32212 from vespa-engine/hmusum/rename-method

Rename a couple of methods
vespa-engine · Aug 21, 2024 · 8473612 · 8473612
2 parents 57db625 + d88806b
commit 8473612
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
@@ -1233,7 +1233,8 @@
       "abstract"
     ],
     "methods" : [
-      "public abstract void startDownload(java.lang.String, int, java.util.Set)"
+      "public void startDownload(java.lang.String, int, java.util.Set)",
+      "public abstract void triggerDownload(java.lang.String, int, java.util.Set)"
     ],
     "fields" : [ ]
   },

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
@@ -19,6 +19,19 @@ public interface FileDistribution {
      * @param port           port which should be used when notifying
      * @param fileReferences set of file references to start downloading
      */
-    void startDownload(String hostName, int port, Set<FileReference> fileReferences);
+    // TODO: Remove when 8.399 is oldest config model version in use
+    default void startDownload(String hostName, int port, Set<FileReference> fileReferences) {
+        triggerDownload(hostName, port, fileReferences);
+    }
+
+    /**
+     * Notifies client which file references to download. Used to trigger downloading early (while
+     * preparing application package).
+     *
+     * @param hostName       host which should be notified about file references to download
+     * @param port           port which should be used when notifying
+     * @param fileReferences set of file references for downloading
+     */
+    void triggerDownload(String hostName, int port, Set<FileReference> fileReferences);
 
 }
diff --git a/...er/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java b/...er/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
@@ -38,7 +38,7 @@ public FileDistributionImpl(Supervisor supervisor) {
      * @param fileReferences set of file references to start downloading
      */
     @Override
-    public void startDownload(String hostName, int port, Set<FileReference> fileReferences) {
+    public void triggerDownload(String hostName, int port, Set<FileReference> fileReferences) {
         Target target = supervisor.connect(new Spec(hostName, port));
         Request request = new Request("filedistribution.setFileReferencesToDownload");
         request.setContext(target);

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
@@ -129,7 +129,8 @@ public SessionPreparer(ModelFactoryRegistry modelFactoryRegistry,
     ExecutorService getExecutor() { return executor; }
 
     /**
-     * Prepares a session (validates, builds model, writes to zookeeper and distributes files)
+     * Prepares a session (validates, builds model, trigger distribution of application package
+     * to other config servers, writes to zookeeper)
      *
      * @param hostValidator               host validator
      * @param logger                      for storing logs returned in response to client.
@@ -150,7 +151,7 @@ public PrepareResult prepare(HostValidator hostValidator, DeployLogger logger, P
             AllocatedHosts allocatedHosts = preparation.buildModels(now);
             preparation.makeResult(allocatedHosts);
             if ( ! params.isDryRun()) {
-                FileReference fileReference = preparation.startDistributionOfApplicationPackage();
+                FileReference fileReference = preparation.triggerDistributionOfApplicationPackage();
                 preparation.writeStateZK(fileReference);
                 preparation.writeEndpointCertificateMetadataZK();
                 preparation.writeContainerEndpointsZK();
@@ -243,15 +244,15 @@ void checkTimeout(String step) {
             }
         }
 
-        FileReference startDistributionOfApplicationPackage() {
+        FileReference triggerDistributionOfApplicationPackage() {
             FileReference fileReference = fileRegistry.addApplicationPackage();
             FileDistribution fileDistribution = fileDistributionFactory.createFileDistribution();
             log.log(Level.FINE, () -> "Ask other config servers to download application package for " +
                     applicationId + " (" + fileReference + ")");
             ConfigServerSpec.fromConfig(configserverConfig)
                       .stream()
                       .filter(spec -> !spec.getHostName().equals(HostName.getLocalhost()))
-                      .forEach(spec -> fileDistribution.startDownload(spec.getHostName(), spec.getConfigServerPort(), Set.of(fileReference)));
+                      .forEach(spec -> fileDistribution.triggerDownload(spec.getHostName(), spec.getConfigServerPort(), Set.of(fileReference)));
 
             checkTimeout("startDistributionOfApplicationPackage");
             return fileReference;