Merge pull request #18983 from vespa-engine/revert-18981-balder/wire-in-executor-in-for-doing-hard-work-in-deploystate

Revert "Wire in executor in deploystate that can be use to speed up deploymen…"

1 files changed, 0 insertions, 16 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 249ca71117a..220599b6d1c 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -5,7 +5,6 @@ import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
 import ai.vespa.rankingexpression.importer.configmodelview.MlModelImporter;
 import com.yahoo.component.Version;
 import com.yahoo.component.Vtag;
-import com.yahoo.concurrent.InThreadExecutorService;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.application.api.FileRegistry;
@@ -56,7 +55,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
 
 /**
@@ -89,7 +87,6 @@ public class DeployState implements ConfigDefinitionStore {
     private final HostProvisioner provisioner;
     private final Provisioned provisioned;
     private final Reindexing reindexing;
-    private final ExecutorService executor;
 
     public static DeployState createTestState() {
         return new Builder().build();
@@ -107,7 +104,6 @@ public class DeployState implements ConfigDefinitionStore {
                         SearchDocumentModel searchDocumentModel,
                         RankProfileRegistry rankProfileRegistry,
                         FileRegistry fileRegistry,
-                        ExecutorService executor,
                         DeployLogger deployLogger,
                         Optional<HostProvisioner> hostProvisioner,
                         Provisioned provisioned,
@@ -128,7 +124,6 @@ public class DeployState implements ConfigDefinitionStore {
                         Reindexing reindexing) {
         this.logger = deployLogger;
         this.fileRegistry = fileRegistry;
-        this.executor = executor;
         this.rankProfileRegistry = rankProfileRegistry;
         this.applicationPackage = applicationPackage;
         this.properties = properties;
@@ -287,8 +282,6 @@ public class DeployState implements ConfigDefinitionStore {
     /** The (machine learned) models imported from the models/ directory, as an unmodifiable map indexed by model name */
     public ImportedMlModels getImportedModels() { return importedModels; }
 
-    public ExecutorService getExecutor() { return executor; }
-
     public Version getWantedNodeVespaVersion() { return wantedNodeVespaVersion; }
 
     public Optional<DockerImage> getWantedDockerImageRepo() { return wantedDockerImageRepo; }
@@ -319,7 +312,6 @@ public class DeployState implements ConfigDefinitionStore {
 
         private ApplicationPackage applicationPackage = MockApplicationPackage.createEmpty();
         private FileRegistry fileRegistry = new MockFileRegistry();
-        private ExecutorService executor = new InThreadExecutorService();
         private DeployLogger logger = new BaseDeployLogger();
         private Optional<HostProvisioner> hostProvisioner = Optional.empty();
         private Provisioned provisioned = new Provisioned();
@@ -337,8 +329,6 @@ public class DeployState implements ConfigDefinitionStore {
         private Optional<DockerImage> wantedDockerImageRepo = Optional.empty();
         private Reindexing reindexing = null;
 
-        public Builder() {}
-
         public Builder applicationPackage(ApplicationPackage applicationPackage) {
             this.applicationPackage = applicationPackage;
             return this;
@@ -349,11 +339,6 @@ public class DeployState implements ConfigDefinitionStore {
             return this;
         }
 
-        public Builder executor(ExecutorService executor) {
-            this.executor = executor;
-            return this;
-        }
-
         public Builder deployLogger(DeployLogger logger) {
             this.logger = logger;
             return this;
@@ -448,7 +433,6 @@ public class DeployState implements ConfigDefinitionStore {
                                    searchDocumentModel,
                                    rankProfileRegistry,
                                    fileRegistry,
-                                   executor,
                                    logger,
                                    hostProvisioner,
                                    provisioned,