diff options
Diffstat (limited to 'config-model/src/main')
4 files changed, 5 insertions, 18 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 1548f6ea728..6777e2fb741 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 @@ -409,17 +409,11 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon int pos = nameAndValue.indexOf('='); environmentVariables.put(nameAndValue.substring(0, pos), nameAndValue.substring(pos+1)); } - public void addEnvironmentVariable(String name, Object value) { environmentVariables.put(name, value); } - @Override - public Map<String, Object> getEnvVars() { - return Map.copyOf(environmentVariables); - } - - public String getEnvStringForTesting() { + public String getEnv() { return environmentVariables.entrySet().stream().map(e -> e.getKey() + '=' + toEnvValue(e.getValue())).collect(Collectors.joining(" ")); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java index d3fad2d94d1..217f6cff778 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java @@ -99,9 +99,6 @@ public class ConfigSentinel extends AbstractService implements SentinelConfig.Pr serviceBuilder.name(s.getServiceName()); serviceBuilder.id(s.getConfigId()); serviceBuilder.affinity(getServiceAffinity(s)); - for (var entry : s.getEnvVars().entrySet()) { - serviceBuilder.environ(b -> b.varname(entry.getKey()).varvalue(entry.getValue().toString())); - } setPreShutdownCommand(serviceBuilder, s); return serviceBuilder; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Service.java b/config-model/src/main/java/com/yahoo/vespa/model/Service.java index 87fd8078c3f..3849a57db6f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/Service.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/Service.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.model; import com.yahoo.config.model.api.ServiceInfo; import java.util.HashMap; -import java.util.Map; import java.util.Optional; /** @@ -22,9 +21,6 @@ public interface Service extends ConfigProducer, NetworkPortRequestor { */ String getStartupCommand(); - // environment variables specific for this service: - Map<String, Object> getEnvVars(); - /** * Services that wish that a command should be run before shutdown * should return the command here. The command will be executed 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 40e57e2f962..3d4e0bd22d4 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 @@ -109,10 +109,10 @@ public class SearchNode extends AbstractService implements SearchNode node = new SearchNode(parent, name, distributionKey, nodeSpec, clusterName, serviceLayerService, flushOnShutdown, tuning, resourceLimits, isHostedVespa, fractionOfMemoryReserved); if (featureFlags.loadCodeAsHugePages()) { - node.addEnvironmentVariable("VESPA_LOAD_CODE_AS_HUGEPAGES", true); + node.addEnvironmentVariable("VESPA_LOAD_CODE_AS_HUGEPAGES", "true"); } - if (featureFlags.sharedStringRepoNoReclaim()) { - node.addEnvironmentVariable("VESPA_SHARED_STRING_REPO_NO_RECLAIM", true); + if ( featureFlags.sharedStringRepoNoReclaim()) { + node.addEnvironmentVariable("VESPA_SHARED_STRING_REPO_NO_RECLAIM", "true"); } return node; } @@ -240,7 +240,7 @@ public class SearchNode extends AbstractService implements @Override public String getStartupCommand() { - String startup = "exec $ROOT/sbin/vespa-proton --identity " + getConfigId(); + String startup = getEnv() + " exec $ROOT/sbin/vespa-proton " + "--identity " + getConfigId(); if (serviceLayerService != null) { startup = startup + " --serviceidentity " + serviceLayerService.getConfigId(); } |