summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-06-18 11:56:59 +0200
committerGitHub <noreply@github.com>2020-06-18 11:56:59 +0200
commit6864b71e1fe6f8e49ce5bf68d3fedc5d4cc2af52 (patch)
treec2b62483416af4661efd2d715f8e59b07f7e48e1 /configserver
parent2c60e812e7a310700529184d354499d11b3cc8c1 (diff)
parent529a7e64716cb2ef56ffdbb176f21ad3184a0b42 (diff)
Merge pull request #13623 from vespa-engine/hmusum/preprocess-application-package-before-distribution
Preprocess application package before distributing to other config se…
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java4
1 files changed, 2 insertions, 2 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 3c83263f781..4542b8267e8 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
@@ -126,10 +126,10 @@ public class SessionPreparer {
Preparation preparation = new Preparation(hostValidator, logger, params, currentActiveApplicationSet,
tenantPath, serverDbSessionDir, applicationPackage, sessionZooKeeperClient);
- // Note: Done before pre-processing, requires that to be done by users of the distributed package
+ preparation.preprocess();
+
var distributedApplicationPackage = preparation.distributeApplicationPackage();
- preparation.preprocess();
try {
AllocatedHosts allocatedHosts = preparation.buildModels(now);
preparation.makeResult(allocatedHosts);