Propagate target-active-docs in monitor reply.

5 files changed, 7 insertions, 7 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
index 99a2bc34a14..7b993e51ffb 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
@@ -268,7 +268,7 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
     private void collectCoverage(Coverage source) {
         answeredDocs += source.getDocs();
         answeredActiveDocs += source.getActive();
-        answeredSoonActiveDocs += source.getSoonActive();
+        answeredSoonActiveDocs += source.getTargetActive();
         answeredNodesParticipated += source.getNodes();
         answeredNodes++;
         degradedByMatchPhase |= source.isDegradedByMatchPhase();
@@ -280,7 +280,7 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
 
         Coverage coverage = new Coverage(answeredDocs, answeredActiveDocs, answeredNodesParticipated, 1);
         coverage.setNodesTried(askedNodes);
-        coverage.setSoonActive(answeredSoonActiveDocs);
+        coverage.setTargetActive(answeredSoonActiveDocs);
         int degradedReason = 0;
         if (timedOut) {
             degradedReason |= (adaptiveTimeoutCalculated ? DEGRADED_BY_ADAPTIVE_TIMEOUT : DEGRADED_BY_TIMEOUT);
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
index 09a101e3bff..73a005d809d 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/ProtobufSerialization.java
@@ -263,7 +263,7 @@ public class ProtobufSerialization {
 
     private static Coverage convertToCoverage(SearchProtocol.SearchReply protobuf) {
         var coverage = new Coverage(protobuf.getCoverageDocs(), protobuf.getActiveDocs(), 1);
-        coverage.setNodesTried(1).setSoonActive(protobuf.getSoonActiveDocs());
+        coverage.setNodesTried(1).setTargetActive(protobuf.getSoonActiveDocs());
 
         int degradedReason = 0;
         if (protobuf.getDegradedByMatchPhase())
@@ -280,7 +280,7 @@ public class ProtobufSerialization {
 
         var coverage = result.getCoverage(false);
         if (coverage != null) {
-            builder.setCoverageDocs(coverage.getDocs()).setActiveDocs(coverage.getActive()).setSoonActiveDocs(coverage.getSoonActive())
+            builder.setCoverageDocs(coverage.getDocs()).setActiveDocs(coverage.getActive()).setSoonActiveDocs(coverage.getTargetActive())
                     .setDegradedBySoftTimeout(coverage.isDegradedByTimeout()).setDegradedByMatchPhase(coverage.isDegradedByMatchPhase());
         }
 
diff --git a/container-search/src/main/java/com/yahoo/search/result/Coverage.java b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
index aa561f58d7a..bab5af8974e 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Coverage.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
@@ -30,7 +30,7 @@ public class Coverage extends com.yahoo.container.handler.Coverage {
      * @return self for chaining
      */
     @Beta
-    public Coverage setSoonActive(long soonActive) { this.soonActive = soonActive; return this; }
+    public Coverage setTargetActive(long soonActive) { this.soonActive = soonActive; return this; }
 
     /**
      * Will set the reasons for degraded coverage as reported by vespa backend.
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java
index 1293975deb5..a225254079e 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java
@@ -438,7 +438,7 @@ public class InterleavedSearchInvokerTest {
 
     private static Coverage createCoverage(int docs, int activeDocs, int soonActiveDocs, int nodes, int nodesTried, int degradedReason) {
         Coverage coverage = new Coverage(docs, activeDocs, nodes);
-        coverage.setSoonActive(soonActiveDocs);
+        coverage.setTargetActive(soonActiveDocs);
         coverage.setNodesTried(nodesTried);
         coverage.setDegradedReason(degradedReason);
         return coverage;
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
index c0b0a90b682..787880f6a4e 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
@@ -74,7 +74,7 @@ public class CoverageTestCase {
         com.yahoo.container.logging.Coverage lc = c.toLoggingCoverage();
         assertEquals(lc.getDocs(), c.getDocs());
         assertEquals(lc.getActive(), c.getActive());
-        assertEquals(lc.getSoonActive(), c.getSoonActive());
+        assertEquals(lc.getSoonActive(), c.getTargetActive());
         assertEquals(lc.getResultPercentage(), c.getResultPercentage());
         assertEquals(lc.isDegraded(), c.isDegraded());
         assertEquals(lc.isDegradedByNonIdealState(), c.isDegradedByNonIdealState());