diff options
3 files changed, 13 insertions, 0 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 7aba83861ce..64a2906b1be 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -118,6 +118,9 @@ public interface ModelContext { // TODO(bjorncs): Temporary feature flag, revisit August 2020 default Duration jdiscHealthCheckProxyClientTimeout() { return Duration.ofMillis(100); } + + // TODO(bjorncs): Temporary feature flag + default double feedCoreThreadPoolSizeFactor() { return 1.0; } } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index eccd6d4431b..d26f6c6da04 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -161,6 +161,7 @@ public class ModelContextImpl implements ModelContext { private final boolean skipMbusReplyThread; private final Optional<AthenzDomain> athenzDomain; private final Optional<ApplicationRoles> applicationRoles; + private final double feedCoreThreadPoolSizeFactor; public Properties(ApplicationId applicationId, boolean multitenantFromConfig, @@ -215,6 +216,8 @@ public class ModelContextImpl implements ModelContext { .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();; this.athenzDomain = athenzDomain; this.applicationRoles = applicationRoles; + feedCoreThreadPoolSizeFactor = Flags.FEED_CORE_THREAD_POOL_SIZE_FACTOR.bindTo(flagSource) + .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @Override @@ -297,6 +300,7 @@ public class ModelContextImpl implements ModelContext { @Override public boolean skipCommunicationManagerThread() { return skipCommunicationManagerThread; } @Override public boolean skipMbusRequestThread() { return skipMbusRequestThread; } @Override public boolean skipMbusReplyThread() { return skipMbusReplyThread; } + @Override public double feedCoreThreadPoolSizeFactor() { return feedCoreThreadPoolSizeFactor; } } } diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 5bd1d3dcc60..e1b44b326bd 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -345,6 +345,12 @@ public class Flags { "Takes effect on next tick" ); + public static final UnboundDoubleFlag FEED_CORE_THREAD_POOL_SIZE_FACTOR = defineDoubleFlag( + "feed-core-thread-pool-size-factor", 1.0, + "Number of core threads in threadpool for feeding APIs as factor of max pool size", + "Takes effect on next internal redeployment", + APPLICATION_ID); + /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, String modificationEffect, FetchVector.Dimension... dimensions) { |