diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-03-04 14:41:27 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-03-04 14:41:27 +0100 |
| commit | bf84e3e18f0f572991826de42d4a60270ea360df (patch) | |
| tree | c828e7906c2cf89d5be32bbbbdf0ccefa6948df0 /configserver/src | |
| parent | 65b1933e6b2c1b5a2b2c678490590c2ad1af3cc2 (diff) | |
Simplify
Diffstat (limited to 'configserver/src')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java | 11 |
1 files changed, 5 insertions, 6 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 5e2a4b60948..89b8c50a289 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 @@ -41,7 +41,6 @@ import com.yahoo.vespa.config.server.modelfactory.PreparedModelsBuilder; import com.yahoo.vespa.config.server.provision.HostProvisionerProvider; import com.yahoo.vespa.config.server.tenant.ApplicationRolesStore; import com.yahoo.vespa.config.server.tenant.ContainerEndpointsCache; -import com.yahoo.vespa.config.server.tenant.EndpointCertificateMetadataSerializer; import com.yahoo.vespa.config.server.tenant.EndpointCertificateMetadataStore; import com.yahoo.vespa.config.server.tenant.EndpointCertificateRetriever; import com.yahoo.vespa.config.server.tenant.TenantRepository; @@ -125,7 +124,7 @@ public class SessionPreparer { AllocatedHosts allocatedHosts = preparation.buildModels(now); preparation.makeResult(allocatedHosts); if ( ! params.isDryRun()) { - preparation.writeStateZK(preparation.distributeApplicationPackage()); + preparation.writeStateZK(); preparation.writeEndpointCertificateMetadataZK(); preparation.writeContainerEndpointsZK(); preparation.writeApplicationRoles(); @@ -229,7 +228,7 @@ public class SessionPreparer { } } - Optional<FileReference> distributeApplicationPackage() { + Optional<FileReference> distributedApplicationPackage() { FileRegistry fileRegistry = fileDistributionProvider.getFileRegistry(); FileReference fileReference = fileRegistry.addApplicationPackage(); FileDistribution fileDistribution = fileDistributionProvider.getFileDistribution(); @@ -264,16 +263,16 @@ public class SessionPreparer { checkTimeout("making result from models"); } - void writeStateZK(Optional<FileReference> distributedApplicationPackage) { + void writeStateZK() { log.log(Level.FINE, "Writing application package state to zookeeper"); writeStateToZooKeeper(sessionZooKeeperClient, preprocessedApplicationPackage, applicationId, - distributedApplicationPackage, + distributedApplicationPackage(), dockerImageRepository, vespaVersion, logger, - prepareResult.getFileRegistries(), + prepareResult.getFileRegistries(), prepareResult.allocatedHosts(), athenzDomain, params.quota(), |