diff options
author | Geir Storli <geirst@yahooinc.com> | 2021-11-05 15:04:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-05 15:04:28 +0100 |
commit | b4d75eb34c424d1f5e2b9b57a43be51a9c8e19b9 (patch) | |
tree | 3187d65a24752531f892f927488fffcf1cb8919b /config-model | |
parent | d09a2c8c3fc89d58ef5c39cd21b34f5c9d9ea6e7 (diff) | |
parent | b994f19b89973f75664ce71f1dad58ffd541f246 (diff) |
Merge pull request #19888 from vespa-engine/geirst/shared-field-writer-executor-feature-flag
Add feature flag for whether to use a shared field writer executor fo…
Diffstat (limited to 'config-model')
3 files changed, 43 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index b7506587102..5183a3ca587 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -42,6 +42,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private String jvmGCOptions = null; private String sequencerType = "LATENCY"; private int feedTaskLimit = 1000; + private String sharedFieldWriterExecutor = "NONE"; private boolean firstTimeDeployment = false; private String responseSequencerType = "ADAPTIVE"; private int responseNumThreads = 2; @@ -85,6 +86,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea @Override public String jvmGCOptions(Optional<ClusterSpec.Type> clusterType) { return jvmGCOptions; } @Override public String feedSequencerType() { return sequencerType; } @Override public int feedTaskLimit() { return feedTaskLimit; } + @Override public String sharedFieldWriterExecutor() { return sharedFieldWriterExecutor; } @Override public boolean isBootstrap() { return false; } @Override public boolean isFirstTimeDeployment() { return firstTimeDeployment; } @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } @@ -172,6 +174,10 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea feedTaskLimit = value; return this; } + public TestProperties setSharedFieldWriterExecutor(String value) { + sharedFieldWriterExecutor = value; + return this; + } public TestProperties setResponseSequencerType(String type) { responseSequencerType = type; return this; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index ff9db4a10bf..917b1d42146 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -65,6 +65,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> private Optional<ResourceLimits> resourceLimits = Optional.empty(); private final ProtonConfig.Indexing.Optimize.Enum feedSequencerType; private final int feedTaskLimit; + private final ProtonConfig.Feeding.Shared_field_writer_executor.Enum sharedFieldWriterExecutor; private final double defaultFeedConcurrency; private final double defaultDiskBloatFactor; private final int defaultDocStoreCompressionLevel; @@ -194,6 +195,14 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> } } + private static ProtonConfig.Feeding.Shared_field_writer_executor.Enum convertSharedFieldWriterExecutor(String value) { + try { + return ProtonConfig.Feeding.Shared_field_writer_executor.Enum.valueOf(value); + } catch (Throwable t) { + return ProtonConfig.Feeding.Shared_field_writer_executor.Enum.NONE; + } + } + private ContentSearchCluster(AbstractConfigProducer<?> parent, String clusterName, ModelContext.FeatureFlags featureFlags, @@ -213,6 +222,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> this.combined = combined; this.feedSequencerType = convertFeedSequencerType(featureFlags.feedSequencerType()); this.feedTaskLimit = featureFlags.feedTaskLimit(); + this.sharedFieldWriterExecutor = convertSharedFieldWriterExecutor(featureFlags.sharedFieldWriterExecutor()); this.defaultFeedConcurrency = featureFlags.feedConcurrency(); this.defaultDiskBloatFactor = featureFlags.diskBloatFactor(); this.defaultDocStoreCompressionLevel = featureFlags.docstoreCompressionLevel(); @@ -435,6 +445,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> builder.indexing.optimize(feedSequencerType); } builder.indexing.tasklimit(feedTaskLimit); + builder.feeding.shared_field_writer_executor(sharedFieldWriterExecutor); } private boolean isGloballyDistributed(NewDocumentType docType) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java index 5395b0868cb..1de37dbeccf 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java @@ -34,6 +34,7 @@ import java.util.List; import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER; +import static com.yahoo.vespa.config.search.core.ProtonConfig.Feeding.Shared_field_writer_executor; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; @@ -823,6 +824,31 @@ public class ContentBuilderTest extends DomBuilderTest { return resolveProtonConfig(props, singleNodeContentXml()).indexing().tasklimit(); } + @Test + public void shared_field_writer_executor_is_controlled_by_feature_flag() { + + assertEquals(Shared_field_writer_executor.Enum.NONE, + resolveSharedFieldWriterExecutorConfigWithFeatureFlag(null)); + assertEquals(Shared_field_writer_executor.Enum.NONE, + resolveSharedFieldWriterExecutorConfigWithFeatureFlag("NONE")); + assertEquals(Shared_field_writer_executor.Enum.INDEX, + resolveSharedFieldWriterExecutorConfigWithFeatureFlag("INDEX")); + assertEquals(Shared_field_writer_executor.Enum.INDEX_AND_ATTRIBUTE, + resolveSharedFieldWriterExecutorConfigWithFeatureFlag("INDEX_AND_ATTRIBUTE")); + assertEquals(Shared_field_writer_executor.Enum.DOCUMENT_DB, + resolveSharedFieldWriterExecutorConfigWithFeatureFlag("DOCUMENT_DB")); + assertEquals(Shared_field_writer_executor.Enum.NONE, + resolveSharedFieldWriterExecutorConfigWithFeatureFlag("invalid")); + } + + private ProtonConfig.Feeding.Shared_field_writer_executor.Enum resolveSharedFieldWriterExecutorConfigWithFeatureFlag(String value) { + var props = new TestProperties(); + if (value != null) { + props.setSharedFieldWriterExecutor(value); + } + return resolveProtonConfig(props, singleNodeContentXml()).feeding().shared_field_writer_executor(); + } + private void verifyThatFeatureFlagControlsVisibilityDelayDefault(Double xmlOverride, double expected) { String hostedXml = xmlWithVisibilityDelay(xmlOverride); var config = resolveProtonConfig(new TestProperties(), hostedXml); |