2 files changed, 5 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java
index 0312db914df..bb5accd9022 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterMonitor.java
@@ -89,7 +89,7 @@ public class ClusterMonitor implements Runnable, Freezable {
         monitor.responded(hasSearchNodesOnline);
         if (wasFailing && monitor.isWorking()) {
             log.info("Failed node '" + node + "' started working again.");
-            nodeManager.working(monitor.getNode());
+            nodeManager.working(node);
         }
         updateVipStatus();
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/NodeMonitor.java b/container-search/src/main/java/com/yahoo/prelude/cluster/NodeMonitor.java
index ab52bab08a0..ba2c693a0fe 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/NodeMonitor.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/NodeMonitor.java
@@ -28,7 +28,7 @@ public class NodeMonitor {
     /** The object representing the monitored node */
     private final VespaBackEndSearcher node;
 
-    private boolean isWorking = false;
+    private boolean isWorking = true;
 
     /** The last time this node responded successfully */
     private long succeededAt = 0;
@@ -72,6 +72,7 @@ public class NodeMonitor {
             // Only count not being able to talk to backend at all
             // as errors we care about
             if ((respondedAt - succeededAt) > 10000) {
+                this.searchNodesOnline = false;
                 setWorking(false, "Not working for 10 s: " + error.toString());
             }
         } else {
@@ -95,9 +96,9 @@ public class NodeMonitor {
         if (isWorking == working) return; // Old news
 
         if (working && ! atStartUp)
-            log.info("Putting " + node + " in service:" + explanation);
+            log.info("Putting " + node + " in service: " + explanation);
         else if (! atStartUp)
-            log.info("Taking " + node + " out of service:" + explanation);
+            log.info("Taking " + node + " out of service: " + explanation);
 
         isWorking = working;
     }