From d54428bc306698601461f03efeae88730a9bb41e Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon.hallingstad@gmail.com>
Date: Thu, 19 Sep 2019 17:11:06 +0200
Subject: Revert "Add test for in and out of vip and fix bug."

---
 .../com/yahoo/search/dispatch/searchcluster/SearchCluster.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'container-search/src/main/java/com/yahoo/search')

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 6f775e7218e..2bcac6e2ce4 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
@@ -239,7 +239,9 @@ public class SearchCluster implements NodeManager<Node> {
             else
                 vipStatus.removeFromRotation(clusterId);
         }
-        else if (localCorpusDispatchTarget.isEmpty() && hasInformationAboutAllNodes()) {
+        else {
+            if ( ! hasInformationAboutAllNodes()) return;
+
             if (hasWorkingNodes())
                 vipStatus.addToRotation(clusterId);
             else
@@ -255,8 +257,8 @@ public class SearchCluster implements NodeManager<Node> {
             else
                 vipStatus.removeFromRotation(clusterId);
         }
-        else if ( localCorpusDispatchTarget.isEmpty()) {
-            if (isInRotation && sufficientCoverage)
+        else {
+            if ( ! isInRotation && sufficientCoverage)
                 vipStatus.addToRotation(clusterId);
         }
     }
-- 
cgit v1.2.3