Add `compute-coverage-from-target-active-docs` feature flag and Dispatch config

Defaults to false.

2 files changed, 23 insertions, 0 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index ac291fc578f..132255570ac 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -1036,6 +1036,27 @@ public class ContentClusterTest extends ContentBaseTest {
         }
     }
 
+    private boolean coverageIsComputedFromTargetActive(Boolean coverageFromTargetActive) {
+        TestProperties properties = new TestProperties();
+        if (coverageFromTargetActive != null) {
+            properties.setComputeCoverageFromTargetActiveDocs(coverageFromTargetActive);
+        }
+        VespaModel model = createEnd2EndOneNode(properties);
+
+        ContentCluster cc = model.getContentClusters().get("storage");
+        DispatchConfig.Builder builder = new DispatchConfig.Builder();
+        cc.getSearch().getConfig(builder);
+
+        return (new DispatchConfig(builder)).computeCoverageFromTargetActiveDocs();
+    }
+
+    @Test
+    public void coverage_from_target_active_dispatch_config_is_controlled_by_properties() {
+        assertFalse(coverageIsComputedFromTargetActive(null)); // TODO update when default changes
+        assertFalse(coverageIsComputedFromTargetActive(false));
+        assertTrue(coverageIsComputedFromTargetActive(true));
+    }
+
     private boolean resolveThreePhaseUpdateConfigWithFeatureFlag(boolean flagEnableThreePhase) {
         VespaModel model = createEnd2EndOneNode(new TestProperties().setUseThreePhaseUpdates(flagEnableThreePhase));
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
index 764e56c1bba..ee5cf57a396 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
@@ -15,6 +15,7 @@ import java.util.List;
 
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
@@ -97,6 +98,7 @@ public class ClusterTest {
         DispatchConfig config = new DispatchConfig(builder);
         assertEquals(2, config.searchableCopies());
         assertEquals(3, config.redundancy());
+        assertFalse(config.computeCoverageFromTargetActiveDocs());
         assertEquals(DispatchConfig.DistributionPolicy.ADAPTIVE, config.distributionPolicy());
         assertEquals(1.0, config.maxWaitAfterCoverageFactor(), DELTA);
         assertEquals(0, config.minWaitAfterCoverageFactor(), DELTA);