remove wiring of useNewLogic flag

5 files changed, 12 insertions, 34 deletions

diff --git a/slobrok/src/apps/slobrok/slobrok.cpp b/slobrok/src/apps/slobrok/slobrok.cpp
index b2748762a12..18a401e1db6 100644
--- a/slobrok/src/apps/slobrok/slobrok.cpp
+++ b/slobrok/src/apps/slobrok/slobrok.cpp
@@ -50,7 +50,6 @@ App::Main()
 {
     uint32_t portnum = 2773;
     vespalib::string cfgId;
-    bool useNewLogic = false;
 
     int argi = 1;
     const char* optArg;
@@ -64,7 +63,7 @@ App::Main()
             portnum = atoi(optArg);
             break;
         case 'N':
-            useNewLogic = true;
+            // ignored
             break;
         default:
             LOG(error, "unknown option letter '%c'", c);
@@ -76,11 +75,11 @@ App::Main()
         if (cfgId.empty()) {
             LOG(debug, "no config id specified");
             ConfigShim shim(portnum);
-            mainobj = std::make_unique<SBEnv>(shim, useNewLogic);
+            mainobj = std::make_unique<SBEnv>(shim);
         } else {
             ConfigShim shim(portnum, cfgId);
             shim.enableStateServer(true);
-            mainobj = std::make_unique<SBEnv>(shim, useNewLogic);
+            mainobj = std::make_unique<SBEnv>(shim);
         }
         hook_sigterm();
         res = mainobj->MainLoop();
diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp
index 6d51285af9c..6ce24be9201 100644
--- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp
+++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp
@@ -227,12 +227,6 @@ void RPCHooks::initRPC(FRT_Supervisor *supervisor) {
     //-------------------------------------------------------------------------
 }
 
-
-bool RPCHooks::useNewLogic() const {
-    return _env.useNewLogic();
-}
-
-
 void RPCHooks::rpc_listNamesServed(FRT_RPCRequest *req) {
     FRT_Values &dst = *req->GetReturn();
     FRT_StringValue *names = dst.AddStringArray(1);
diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.h b/slobrok/src/vespa/slobrok/server/rpchooks.h
index bb2eb91eda9..bd051df64f1 100644
--- a/slobrok/src/vespa/slobrok/server/rpchooks.h
+++ b/slobrok/src/vespa/slobrok/server/rpchooks.h
@@ -56,33 +56,24 @@ public:
     void countFailedHeartbeat() { _cnts.heartBeatFails++; }
 
 private:
-    bool useNewLogic() const;
-
-    void rpc_lookupRpcServer(FRT_RPCRequest *req);
-
-    void new_registerRpcServer(FRT_RPCRequest *req);
-    void new_unregisterRpcServer(FRT_RPCRequest *req);
-    void new_wantAdd(FRT_RPCRequest *req);
-    void new_doRemove(FRT_RPCRequest *req);
-    void new_doAdd(FRT_RPCRequest *req);
-
     void rpc_registerRpcServer(FRT_RPCRequest *req);
     void rpc_unregisterRpcServer(FRT_RPCRequest *req);
-
     void rpc_addPeer(FRT_RPCRequest *req);
     void rpc_removePeer(FRT_RPCRequest *req);
+    void rpc_incrementalFetch(FRT_RPCRequest *req);
+    void rpc_doRemove(FRT_RPCRequest *req);
+    void rpc_fetchLocalView(FRT_RPCRequest *req);
+    void rpc_listNamesServed(FRT_RPCRequest *req);
+
+    /** for unit tests and debugging, consider removing some of these: */
+    void rpc_lookupRpcServer(FRT_RPCRequest *req);
     void rpc_listManagedRpcServers(FRT_RPCRequest *req);
     void rpc_lookupManaged(FRT_RPCRequest *req);
     void rpc_listAllRpcServers(FRT_RPCRequest *req);
-    void rpc_incrementalFetch(FRT_RPCRequest *req);
     void rpc_wantAdd(FRT_RPCRequest *req);
     void rpc_doAdd(FRT_RPCRequest *req);
-    void rpc_doRemove(FRT_RPCRequest *req);
-    void rpc_fetchLocalView(FRT_RPCRequest *req);
-
-    void rpc_listNamesServed(FRT_RPCRequest *req);
-    void rpc_getRpcServerHistory(FRT_RPCRequest *req);
 
+    /** consider removing: */
     void rpc_stop(FRT_RPCRequest *req);
     void rpc_version(FRT_RPCRequest *req);
 };
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp
index b9d92a3e312..1d279994cb0 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.cpp
+++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp
@@ -97,15 +97,12 @@ ConfigTask::PerformTask()
 
 } // namespace slobrok::<unnamed>
 
-SBEnv::SBEnv(const ConfigShim &shim) : SBEnv(shim, true) {}
-
-SBEnv::SBEnv(const ConfigShim &shim, bool useNewConsensusLogic)
+SBEnv::SBEnv(const ConfigShim &shim)
     : _transport(std::make_unique<FNET_Transport>(TransportConfig().drop_empty_buffers(true))),
       _supervisor(std::make_unique<FRT_Supervisor>(_transport.get())),
       _configShim(shim),
       _configurator(shim.factory().create(*this)),
       _shuttingDown(false),
-      _useNewLogic(useNewConsensusLogic),
       _partnerList(),
       _me(createSpec(_configShim.portNumber())),
       _rpcHooks(*this),
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h
index 3c4b6e5d403..09986e037a9 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.h
+++ b/slobrok/src/vespa/slobrok/server/sbenv.h
@@ -42,7 +42,6 @@ private:
     ConfigShim         _configShim;
     Configurator::UP   _configurator;
     bool               _shuttingDown;
-    const bool         _useNewLogic;
 
     SBEnv(const SBEnv &);            // Not used
     SBEnv &operator=(const SBEnv &); // Not used
@@ -68,7 +67,6 @@ private:
 
 public:
     explicit SBEnv(const ConfigShim &shim);
-    SBEnv(const ConfigShim &shim, bool useNewConsensusLogic);
     ~SBEnv();
 
     FNET_Transport *getTransport() { return _transport.get(); }
@@ -101,7 +99,6 @@ public:
 
     bool isSuspended() const { return false; }
     bool isShuttingDown() const { return _shuttingDown; }
-    bool useNewLogic() const { return _useNewLogic; }
 
     int MainLoop();