Only set OMP_NUM_TREADS for SearchNode which is the only user of openblas.

2 files changed, 4 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index 6777e2fb741..1ce9d1d006d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model;
 
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.api.PortInfo;
 import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.model.deploy.DeployState;
@@ -29,8 +28,6 @@ import static com.yahoo.text.Lowercase.toLowerCase;
  */
 public abstract class AbstractService extends AbstractConfigProducer<AbstractConfigProducer<?>> implements Service {
 
-    private static final long serialVersionUID = 1L;
-
     // The physical host this Service runs on.
     private HostResource hostResource = null;
 
@@ -88,7 +85,6 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
      */
     public AbstractService(AbstractConfigProducer<?> parent, String name) {
         super(parent, name);
-        environmentVariables.put("OMP_NUM_THREADS", 1);
         environmentVariables.put("VESPA_SILENCE_CORE_ON_OOM", true);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 3d4e0bd22d4..36300b02de8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -94,7 +94,7 @@ public class SearchNode extends AbstractService implements
         }
 
         @Override
-        protected SearchNode doBuild(DeployState deployState, AbstractConfigProducer ancestor, Element producerSpec) {
+        protected SearchNode doBuild(DeployState deployState, AbstractConfigProducer<?> ancestor, Element producerSpec) {
             return SearchNode.create(ancestor, name, contentNode.getDistributionKey(), nodeSpec, clusterName, contentNode,
                                      flushOnShutdown, tuning, resourceLimits, deployState.isHosted(),
                                      fractionOfMemoryReserved, deployState.featureFlags());
@@ -102,7 +102,7 @@ public class SearchNode extends AbstractService implements
 
     }
 
-    public static SearchNode create(AbstractConfigProducer parent, String name, int distributionKey, NodeSpec nodeSpec,
+    public static SearchNode create(AbstractConfigProducer<?> parent, String name, int distributionKey, NodeSpec nodeSpec,
                                     String clusterName, AbstractService serviceLayerService, boolean flushOnShutdown,
                                     Optional<Tuning> tuning, Optional<ResourceLimits> resourceLimits, boolean isHostedVespa,
                                     double fractionOfMemoryReserved, ModelContext.FeatureFlags featureFlags) {
@@ -117,7 +117,7 @@ public class SearchNode extends AbstractService implements
         return node;
     }
 
-    private SearchNode(AbstractConfigProducer parent, String name, int distributionKey, NodeSpec nodeSpec,
+    private SearchNode(AbstractConfigProducer<?> parent, String name, int distributionKey, NodeSpec nodeSpec,
                        String clusterName, AbstractService serviceLayerService, boolean flushOnShutdown,
                        Optional<Tuning> tuning, Optional<ResourceLimits> resourceLimits, boolean isHostedVespa,
                        double fractionOfMemoryReserved) {
@@ -138,6 +138,7 @@ public class SearchNode extends AbstractService implements
         this.tuning = tuning;
         this.resourceLimits = resourceLimits;
         setPropertiesElastic(clusterName, distributionKey);
+        addEnvironmentVariable("OMP_NUM_THREADS", 1);
     }
 
     private void setPropertiesElastic(String clusterName, int distributionKey) {