Merge pull request #12141 from vespa-engine/balder/keep-silent-until-you-know-what-you-are-talking-about

Keep silent until you know what you are talking about.

2 files changed, 9 insertions, 0 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index 91bd5c6da11..24ecea9c3ee 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -132,6 +132,14 @@ public class Dispatcher extends AbstractComponent {
                 Thread.sleep(1);
             }
         } catch (InterruptedException e) {}
+
+        /*
+         * No we have information from all nodes and a ping iteration has completed.
+         * Instead of waiting until next ping interval to update coverage and group state,
+         * we should compute the state ourselves, so that when the dispatcher is ready the state
+         * of its groups are also known.
+         */
+        searchCluster.pingIterationCompleted();
     }
 
     /** Returns the search cluster this dispatches to */
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
index d44ade66967..1da13f6c082 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
@@ -378,6 +378,7 @@ public class SearchCluster implements NodeManager<Node> {
     }
 
     private void trackGroupCoverageChanges(int index, Group group, boolean fullCoverage, long averageDocuments) {
+        if ( ! hasInformationAboutAllNodes()) return; // Be silent until we know what we are talking about.
         boolean changed = group.isFullCoverageStatusChanged(fullCoverage);
         if (changed || (!fullCoverage && System.currentTimeMillis() > nextLogTime)) {
             nextLogTime = System.currentTimeMillis() + 30 * 1000;