Merge pull request #17496 from vespa-engine/revert-17480-arnej/more-slobrok-info-messages

Revert "add more logging" MERGEOK

16 files changed, 134 insertions, 170 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
index b54d816308b..8a25f9a9e76 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
@@ -72,7 +72,6 @@ public class DummyVdsNode {
         public void reset() {}
         public double get() { return 0.01; }
         public boolean shouldWarn(double v) { return false; }
-        public boolean shouldInform(double v) { return false; }
     }
     private final List<Req> waitingRequests = new LinkedList<>();
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index ce2a08effce..1d7b6886222 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -93,7 +93,6 @@ public abstract class FleetControllerTest implements Waiter {
         public void reset() { counter = 0; }
         public double get() { ++counter; return 0.01; }
         public boolean shouldWarn(double v) { return ((counter % 1000) == 10); }
-        public boolean shouldInform(double v) { return false; }
     }
 
     protected class CleanupZookeeperLogsOnSuccess extends TestWatcher {
diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/BackOff.java b/jrt/src/com/yahoo/jrt/slobrok/api/BackOff.java
index f883ac32b72..d8a6718b407 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/BackOff.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/BackOff.java
@@ -1,18 +1,15 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt.slobrok.api;
 
+
 class BackOff implements BackOffPolicy
 {
-    private static final double initialTime = 0.50;
-
-    private double time = initialTime;
+    private double time = 0.50;
 
-    @Override
     public void reset() {
-        time = initialTime;
+        time = 0.50;
     }
 
-    @Override
     public double get() {
         double ret = time;
         if (time < 5.0) {
@@ -27,13 +24,7 @@ class BackOff implements BackOffPolicy
         return ret;
     }
 
-    @Override
     public boolean shouldWarn(double t) {
         return ((t > 8.1 && t < 9.9) || (t > 29.9));
     }
-
-    @Override
-    public boolean shouldInform(double t) {
-        return (t == initialTime);
-    }
 }
diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/BackOffPolicy.java b/jrt/src/com/yahoo/jrt/slobrok/api/BackOffPolicy.java
index 4cc402b1706..f98e3456880 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/BackOffPolicy.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/BackOffPolicy.java
@@ -35,12 +35,4 @@ public interface BackOffPolicy
      * @param t current delay value
      **/
     public boolean shouldWarn(double t);
-
-    /**
-     * Check if a certain delay should result in an information message logged.
-     *
-     * @return true if we should log
-     * @param t current delay value
-     **/
-    public boolean shouldInform(double t);
 }
diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
index 6e39e2a3dbd..1a00cd25a2c 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
@@ -39,7 +39,6 @@ public class Mirror implements IMirror {
     private final BackOffPolicy     backOff;
     private volatile int      updates    = 0;
     private boolean requestDone = false;
-    private boolean logOnSuccess = true;
     private AtomicReference<Entry[]>  specs = new AtomicReference<>(new Entry[0]);
     private int specsGeneration = 0;
     private final TransportThread transportThread;
@@ -177,22 +176,18 @@ public class Mirror implements IMirror {
         }
 
         if (target != null && ! slobroks.contains(currSlobrok)) {
-            log.log(Level.INFO, "location broker "+currSlobrok+" removed, will disconnect and use one of: "+slobroks);
             target.close();
             target = null;
         }
         if (target == null) {
-            logOnSuccess = true;
             currSlobrok = slobroks.nextSlobrokSpec();
             if (currSlobrok == null) {
                 double delay = backOff.get();
-                Level level = Level.FINE;
-                if (backOff.shouldInform(delay)) level = Level.INFO;
-                // note: since this happens quite often during normal operation,
-                // the level is lower than the more-natural Level.WARNING:
-                if (backOff.shouldWarn(delay)) level = Level.INFO;
-                log.log(level, "no location brokers available, retrying: "+slobroks+" (in " + delay + " seconds)");
                 updateTask.schedule(delay);
+                if (backOff.shouldWarn(delay)) {
+                    log.log(Level.INFO, "no location brokers available "
+                            + "(retry in " + delay + " seconds) for: " + slobroks);
+                }
                 return;
             }
             target = orb.connect(new Spec(currSlobrok));
@@ -221,11 +216,6 @@ public class Mirror implements IMirror {
                 for (int idx = 0; idx < numNames; idx++) {
                     newSpecs[idx] = new Entry(n[idx], s[idx]);
                 }
-                if (logOnSuccess) {
-                    log.log(Level.INFO, "successfully connected to location broker "+currSlobrok+
-                            "(mirror initialized with "+numNames+" service names)");
-                    logOnSuccess = false;
-                }
                 specs.set(newSpecs);
 
                 specsGeneration = answer.get(2).asInt32();
@@ -243,16 +233,15 @@ public class Mirror implements IMirror {
             || (req.returnValues().get(2).count() !=
                 req.returnValues().get(3).count()))
         {
-            if (! logOnSuccess) {
-                log.log(Level.INFO, "Error with location broker "+currSlobrok+" update: " + req.errorMessage() +
-                        " (error code " + req.errorCode() + ")");
-            }
+            log.log(Level.INFO, "Error when handling update from slobrok. Error: " + req.errorMessage() +
+                    " (error code " + req.errorCode() + ")" + ", target: " + target);
             target.close();
             target = null;
             updateTask.scheduleNow(); // try next slobrok
             return;
         }
 
+
         Values answer = req.returnValues();
 
         int diffFromGeneration = answer.get(0).asInt32();
@@ -290,10 +279,7 @@ public class Mirror implements IMirror {
                     newSpecs[idx++] = e;
                 }
             }
-            if (logOnSuccess) {
-                log.log(Level.INFO, "successfully connected to location broker "+currSlobrok+" (mirror initialized with "+newSpecs.length+" service names)");
-                logOnSuccess = false;
-            }
+
             specs.set(newSpecs);
 
             specsGeneration = diffToGeneration;
diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/Register.java b/jrt/src/com/yahoo/jrt/slobrok/api/Register.java
index 0da390f8bf6..713cecc62d1 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/Register.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/Register.java
@@ -181,7 +181,6 @@ public class Register {
             reqDone = false;
 
             boolean logOnSuccess = false;
-            boolean logOnFailure = true;
             synchronized (this) {
                 if (req.methodName().equals(UNREGISTER_METHOD_NAME)) {
                     logOnSuccess = true;
@@ -192,21 +191,16 @@ public class Register {
                     lastRegisterSucceeded.remove(name);
                 } else {
                     final Boolean lastSucceeded = lastRegisterSucceeded.get(name);
-                    if (lastSucceeded == null) {
-                        logOnSuccess = true;
-                        logOnFailure = false;
-                    } else if (lastSucceeded != !req.isError()) {
+                    if (lastSucceeded == null || lastSucceeded != !req.isError()) {
                         logOnSuccess = true;
+                        lastRegisterSucceeded.put(name, !req.isError());
                     }
-                    lastRegisterSucceeded.put(name, !req.isError());
                 }
             }
 
             if (req.isError()) {
                  if (req.errorCode() != ErrorCode.METHOD_FAILED) {
-                     if (logOnFailure) {
-                         log.log(Level.INFO, logMessagePrefix() + " failed, will disconnect: " + req.errorMessage() + " (code " + req.errorCode() + ")");
-                     }
+                    log.log(Level.INFO, logMessagePrefix() + " failed, will disconnect: " + req.errorMessage() + " (code " + req.errorCode() + ")");
                     target.close();
                     target = null;
                 } else {
@@ -216,6 +210,7 @@ public class Register {
                 log.log(logOnSuccess ? Level.INFO : Level.FINE, logMessagePrefix() + " completed successfully");
                 backOff.reset();
             }
+
             req = null;
             name = null;
         }
@@ -224,7 +219,7 @@ public class Register {
             return; // current request still in progress
         }
         if (target != null && ! slobroks.contains(currSlobrok)) {
-            log.log(Level.INFO, "[RPC @ " + mySpec + "] location broker " + currSlobrok + " removed, will disconnect and use one of: "+slobroks);
+            log.log(Level.INFO, "RPC server " + mySpec + ": Slobrok server " + currSlobrok + " removed, will disconnect");
             target.close();
             target = null;
         }
@@ -232,10 +227,9 @@ public class Register {
             currSlobrok = slobroks.nextSlobrokSpec();
             if (currSlobrok == null) {
                 double delay = backOff.get();
-                Level level = Level.FINE;
-                if (backOff.shouldInform(delay)) level = Level.INFO;
-                if (backOff.shouldWarn(delay)) level = Level.WARNING;
-                log.log(level, "[RPC @ " + mySpec + "] no location brokers available, retrying: "+slobroks+" (in " + delay + " seconds)");
+                Level level = backOff.shouldWarn(delay) ? Level.WARNING : Level.FINE;
+                log.log(level, "RPC server " + mySpec + ": All Slobrok servers tried, will retry in " + delay
+                            + " seconds: " + slobroks);
                 updateTask.schedule(delay);
                 return;
             }
@@ -253,8 +247,8 @@ public class Register {
             }
 
             if (logFine) {
-                log.log(Level.FINE, "[RPC @ " + mySpec + "] Connect to location broker " + currSlobrok +
-                        " and reregister all service names: " + namesString);
+                log.log(Level.FINE, "RPC server " + mySpec + ": Connect to Slobrok server " + currSlobrok +
+                        " and reregister all Slobrok names: " + namesString);
             }
         }
 
@@ -267,7 +261,7 @@ public class Register {
                 req = new Request(REGISTER_METHOD_NAME);
             } else {
                 pending.addAll(names);
-                log.log(Level.FINE, "[RPC @ " + mySpec + "] Reregister all service names in 30 seconds: " + names);
+                log.log(Level.FINE, "RPC server " + mySpec + ": Reregister all Slobrok names in 30 seconds: " + names);
                 updateTask.schedule(30.0);
                 return;
             }
@@ -280,9 +274,9 @@ public class Register {
     }
 
     private String logMessagePrefix() {
-        return "[RPC @ " + mySpec + "] "
-                + (req.methodName().equals(UNREGISTER_METHOD_NAME) ? "unregistering " : "registering ")
-                + name + " with location broker " + currSlobrok;
+        return "RPC server " + mySpec
+                + (req.methodName().equals(UNREGISTER_METHOD_NAME) ? " unregistering " : " registering ")
+                + name + " with Slobrok server " + currSlobrok;
     }
 
     private synchronized void handleRpcList(Request req) {
diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java b/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java
index 10d8923d9f5..b524c25d8ff 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/SlobrokList.java
@@ -48,7 +48,7 @@ public class SlobrokList {
     public boolean contains(String slobrok) {
         checkUpdate();
         for (String s : slobroks) {
-            if (s.equals(slobrok)) return true;
+            if (s == slobrok) return true;
         }
         return false;
     }
diff --git a/slobrok/src/tests/backoff/testbackoff.cpp b/slobrok/src/tests/backoff/testbackoff.cpp
index 40ca1ac17ba..e3d799bfb72 100644
--- a/slobrok/src/tests/backoff/testbackoff.cpp
+++ b/slobrok/src/tests/backoff/testbackoff.cpp
@@ -11,47 +11,85 @@ TEST_SETUP(Test);
 
 //-----------------------------------------------------------------------------
 
+static double expectWait[21] = {
+	0.5, 1.0, 1.5, 2.0, 2.5,
+        3.0, 3.5, 4.0, 4.5,
+	5.0, 6.0, 7.0, 8.0, 9.0,
+        10, 15, 20, 25, 30, 30, 30
+};
+
 int
 Test::Main()
 {
     TEST_INIT("backoff_test");
 
     BackOff one;
-    EXPECT_TRUE(one.shouldWarn());
+    EXPECT_FALSE(one.shouldWarn());
     EXPECT_EQUAL(0.500, one.get());
-    for (int i = 2; i < 41; i++) {
-        EXPECT_EQUAL(0.5 * i, one.get());
-    }
-    for (int i = 1; i < 1000; i++) {
-        EXPECT_EQUAL(20.0, one.get());
-    }
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(1.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(1.500, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(2.000, one.get());
+    EXPECT_TRUE(one.shouldWarn());
+
+    EXPECT_EQUAL(2.500, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(3.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(3.500, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(4.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(4.500, one.get());
+    EXPECT_TRUE(one.shouldWarn());
+
+    EXPECT_EQUAL(5.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(6.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(7.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(8.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(9.000, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(10.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(15.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(20.00, one.get());
+    EXPECT_TRUE(one.shouldWarn());
+
+    EXPECT_EQUAL(25.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(30.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(30.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(30.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(30.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+    EXPECT_EQUAL(30.00, one.get());
+    EXPECT_FALSE(one.shouldWarn());
+
     TEST_FLUSH();
 
     BackOff two;
-    for (int i = 1; i < 50; i++) {
-        double expect = 0.5 * i;
-        if (expect > 20.0) expect = 20.0;
-        EXPECT_EQUAL(expect, two.get());
-        if (i == 1 || i == 7 || i == 18) {
+    for (int i = 0; i < 21; i++) {
+        EXPECT_EQUAL(expectWait[i], two.get());
+        if (i == 3 || i == 8 || i == 16) {
             EXPECT_TRUE(two.shouldWarn());
         } else {
             EXPECT_FALSE(two.shouldWarn());
         }
     }
     two.reset();
-    for (int i = 1; i < 50; i++) {
-        double expect = 0.5 * i;
-        if (expect > 20.0) expect = 20.0;
-        EXPECT_EQUAL(expect, two.get());
-        if (i == 1 || i == 7 || i == 18) {
-            EXPECT_TRUE(two.shouldWarn());
-        } else {
-            EXPECT_FALSE(two.shouldWarn());
-        }
-    }
-    for (int i = 0; i < 50000; i++) {
-        EXPECT_EQUAL(20.0, two.get());
-        if ((i % 180) == 5) {
+    for (int i = 0; i < 21; i++) {
+        EXPECT_EQUAL(expectWait[i], two.get());
+        if (i == 7 || i == 15) {
             EXPECT_TRUE(two.shouldWarn());
         } else {
             EXPECT_FALSE(two.shouldWarn());
diff --git a/slobrok/src/vespa/slobrok/CMakeLists.txt b/slobrok/src/vespa/slobrok/CMakeLists.txt
index 00ccadb1226..92edaf79c7d 100644
--- a/slobrok/src/vespa/slobrok/CMakeLists.txt
+++ b/slobrok/src/vespa/slobrok/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(slobrok
     SOURCES
-    backoff.cpp
     sblist.cpp
     cfg.cpp
     sbmirror.cpp
diff --git a/slobrok/src/vespa/slobrok/backoff.cpp b/slobrok/src/vespa/slobrok/backoff.cpp
deleted file mode 100644
index e09e688f646..00000000000
--- a/slobrok/src/vespa/slobrok/backoff.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "backoff.h"
-
-namespace slobrok::api {
-
-namespace {
-constexpr size_t num_warn_intervals = 5;
-const double warn_intervals[num_warn_intervals] = { 0.0, 10.0, 60.0, 600.0, 3600.0 };
-}
-
-BackOff::BackOff() { reset(); }
-
-void BackOff::reset() {
-    _time = 0.0;
-    _since_last_warn = 0.0;
-    _nextwarn_idx = 0;
-}
-
-double BackOff::get() {
-        _since_last_warn += _time;
-        if (_time < 20.0) {
-            _time += 0.5;
-        }
-        return _time;
-}
-
-bool BackOff::shouldWarn() {
-    if (_since_last_warn >= warn_intervals[_nextwarn_idx]) {
-        if (_nextwarn_idx + 1 < num_warn_intervals) {
-            ++_nextwarn_idx;
-        }
-        _since_last_warn = 0.0;
-        return true;
-    }
-    return false;
-}
-
-} // namespace slobrok::api
diff --git a/slobrok/src/vespa/slobrok/backoff.h b/slobrok/src/vespa/slobrok/backoff.h
index 53193a9de6e..9bfc4667e6d 100644
--- a/slobrok/src/vespa/slobrok/backoff.h
+++ b/slobrok/src/vespa/slobrok/backoff.h
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <stdio.h>
-
 namespace slobrok {
 namespace api {
 
@@ -10,14 +8,39 @@ class BackOff
 {
 private:
     double _time;
-    double _since_last_warn;
-    size_t _nextwarn_idx;
+    double _warntime;
+    double _nextwarn;
 
 public:
-    BackOff();
-    void reset();
-    double get();
-    bool shouldWarn();
+    BackOff() : _time(0.50), _warntime(0.0), _nextwarn(4.0) {}
+    void reset() { _time = 0.50; _warntime = 0.0; _nextwarn = 15.0; }
+    double get() {
+        double ret = _time;
+        _warntime += ret;
+        if (_time < 5.0) {
+            _time += 0.5;
+        } else if (_time < 10.0) {
+            _time += 1.0;
+        } else if (_time < 30.0) {
+            _time += 5;
+        } else {
+            // max retry time is 30 seconds
+            _time = 30.0;
+        }
+        return ret;
+    }
+    bool shouldWarn() {
+        if (_warntime > _nextwarn) {
+            _warntime = 0.0;
+            _nextwarn *= 4.0;
+            if (_nextwarn > 86400.0) {
+                _nextwarn = 86400.0;
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
 };
 
 } // namespace api
diff --git a/slobrok/src/vespa/slobrok/sblist.cpp b/slobrok/src/vespa/slobrok/sblist.cpp
index 2cb5f0b3d60..e7528fb6db2 100644
--- a/slobrok/src/vespa/slobrok/sblist.cpp
+++ b/slobrok/src/vespa/slobrok/sblist.cpp
@@ -60,12 +60,12 @@ SlobrokList::logString()
     if (_slobrokSpecs.size() == 0) {
         return "[empty service location broker list]";
     }
-    std::string v = "[";
-    for (size_t i = 0 ; i < _slobrokSpecs.size(); ++i) {
-        if (i > 0) v += ", ";
+    std::string v;
+    v = _slobrokSpecs[0];
+    for (size_t i = 1 ; i < _slobrokSpecs.size(); ++i) {
+        v += " or ";
         v += _slobrokSpecs[i];
     }
-    v += "]";
     return v;
 }
 
diff --git a/slobrok/src/vespa/slobrok/sbmirror.cpp b/slobrok/src/vespa/slobrok/sbmirror.cpp
index 6aff47e13fd..460d61cb2a8 100644
--- a/slobrok/src/vespa/slobrok/sbmirror.cpp
+++ b/slobrok/src/vespa/slobrok/sbmirror.cpp
@@ -16,7 +16,6 @@ MirrorAPI::MirrorAPI(FRT_Supervisor &orb, const ConfiguratorFactory & config)
       _reqPending(false),
       _scheduled(false),
       _reqDone(false),
-      _logOnSuccess(true),
       _specs(),
       _specsGen(),
       _updates(),
@@ -235,11 +234,6 @@ MirrorAPI::handleReqDone()
         } else {
             _backOff.reset();
             // req done OK
-            if (_logOnSuccess) {
-                LOG(info, "successfully connected to location broker %s (mirror initialized with %zu service names)",
-                    _currSlobrok.c_str(), _specs.size());
-                _logOnSuccess = false;
-            }
             return true;
         }
     }
@@ -251,7 +245,6 @@ void
 MirrorAPI::handleReconnect()
 {
     if (_target == 0) {
-        _logOnSuccess = true;
         _currSlobrok = _slobrokSpecs.nextSlobrokSpec();
         if (_currSlobrok.size() > 0) {
             _target = _orb.GetTarget(_currSlobrok.c_str());
@@ -263,12 +256,10 @@ MirrorAPI::handleReconnect()
             }
             double delay = _backOff.get();
             reSched(delay);
-            std::string cps = _slobrokSpecs.logString();
-            const char * const msgfmt = "no location brokers available, retrying: %s (in %.1f seconds)";
             if (_backOff.shouldWarn()) {
-                LOG(warning, msgfmt, cps.c_str(), delay);
-            } else {
-                LOG(debug, msgfmt, cps.c_str(), delay);
+                std::string cps = _slobrokSpecs.logString();
+                LOG(warning, "cannot connect to location broker at %s (retry in %f seconds)",
+                    cps.c_str(), delay);
             }
         }
     }
diff --git a/slobrok/src/vespa/slobrok/sbmirror.h b/slobrok/src/vespa/slobrok/sbmirror.h
index c1c7009ce12..437ef334af6 100644
--- a/slobrok/src/vespa/slobrok/sbmirror.h
+++ b/slobrok/src/vespa/slobrok/sbmirror.h
@@ -92,7 +92,6 @@ private:
     bool                     _reqPending;
     bool                     _scheduled;
     bool                     _reqDone;
-    bool                     _logOnSuccess;
     SpecList                 _specs;
     vespalib::GenCnt         _specsGen;
     vespalib::GenCnt         _updates;
diff --git a/slobrok/src/vespa/slobrok/sbregister.cpp b/slobrok/src/vespa/slobrok/sbregister.cpp
index 06a9fb2d79e..72be5f69538 100644
--- a/slobrok/src/vespa/slobrok/sbregister.cpp
+++ b/slobrok/src/vespa/slobrok/sbregister.cpp
@@ -58,7 +58,6 @@ RegisterAPI::RegisterAPI(FRT_Supervisor &orb, const ConfiguratorFactory & config
       _hooks(*this),
       _lock(),
       _reqDone(false),
-      _logOnSuccess(true),
       _busy(false),
       _slobrokSpecs(),
       _configurator(config.create(_slobrokSpecs)),
@@ -147,11 +146,6 @@ RegisterAPI::handleReqDone()
                     _req->GetErrorMessage());
             }
         } else {
-            if (_logOnSuccess && (_pending.size() == 0) && (_names.size() > 0)) {
-                LOG(info, "[RPC @ %s] registering %s with location broker %s completed successfully",
-                    createSpec(_orb).c_str(), _names[0].c_str(), _currSlobrok.c_str());
-                _logOnSuccess = false;
-            }
             // reset backoff strategy on any successful request
             _backOff.reset();
         }
@@ -167,14 +161,13 @@ RegisterAPI::handleReconnect()
     if (_configurator->poll() && _target != 0) {
         if (! _slobrokSpecs.contains(_currSlobrok)) {
             vespalib::string cps = _slobrokSpecs.logString();
-            LOG(warning, "[RPC @ %s] location broker %s removed, will disconnect and use one of: %s",
-                createSpec(_orb).c_str(), _currSlobrok.c_str(), cps.c_str());
+            LOG(warning, "current server %s not in list of location brokers: %s",
+                _currSlobrok.c_str(), cps.c_str());
             _target->SubRef();
             _target = 0;
         }
     }
     if (_target == 0) {
-        _logOnSuccess = true;
         _currSlobrok = _slobrokSpecs.nextSlobrokSpec();
         if (_currSlobrok.size() > 0) {
             // try next possible server.
@@ -192,13 +185,13 @@ RegisterAPI::handleReconnect()
             // possibly with a warning.
             double delay = _backOff.get();
             Schedule(delay);
-            const char * const msgfmt = "[RPC @ %s] no location brokers available, retrying: %s (in %.1f seconds)";
-            vespalib::string cps = _slobrokSpecs.logString();
             if (_backOff.shouldWarn()) {
-                LOG(warning, msgfmt, createSpec(_orb).c_str(), cps.c_str(), delay);
+                vespalib::string cps = _slobrokSpecs.logString();
+                LOG(warning, "cannot connect to location broker at %s "
+                    "(retry in %f seconds)", cps.c_str(), delay);
             } else {
-                LOG(debug, msgfmt, createSpec(_orb).c_str(), cps.c_str(), delay);
-            }
+                LOG(debug, "slobrok retry in %f seconds", delay);
+	    }
             return;
         }
     }
diff --git a/slobrok/src/vespa/slobrok/sbregister.h b/slobrok/src/vespa/slobrok/sbregister.h
index 8e849e1ea13..8e8614fdf0a 100644
--- a/slobrok/src/vespa/slobrok/sbregister.h
+++ b/slobrok/src/vespa/slobrok/sbregister.h
@@ -87,7 +87,6 @@ private:
     RPCHooks                 _hooks;
     std::mutex               _lock;
     bool                     _reqDone;
-    bool                     _logOnSuccess;
     std::atomic<bool>        _busy;
     SlobrokList              _slobrokSpecs;
     Configurator::UP         _configurator;