diff options
| author | Arne H Juul <arnej@yahooinc.com> | 2021-09-16 13:12:56 +0000 |
|---|---|---|
| committer | Arne H Juul <arnej@yahooinc.com> | 2021-09-20 10:28:51 +0000 |
| commit | 965720b1f8ba649b2eadd00b74f749286e382621 (patch) | |
| tree | 5067f25d7c1fd6e1c0dfa8c49534940d1c0544f9 /slobrok | |
| parent | 23a050f3ae7755670a1b13e9f26fe8b19fb81042 (diff) | |
no double logic if feature flag is on
Diffstat (limited to 'slobrok')
| -rw-r--r-- | slobrok/src/vespa/slobrok/server/rpchooks.cpp | 8 | ||||
| -rw-r--r-- | slobrok/src/vespa/slobrok/server/sbenv.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp index 540060210ed..85e322dd652 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp +++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp @@ -257,9 +257,11 @@ void RPCHooks::rpc_registerRpcServer(FRT_RPCRequest *req) { } req->Detach(); _env.localMonitorMap().addLocal(mapping, std::make_unique<RequestCompletionHandler>(req)); - // TODO: remove this - auto script = ScriptCommand::makeRegRpcSrvCmd(_env, dName, dSpec, nullptr); - script.doRequest(); + if (! useNewLogic()) { + // TODO: remove this + auto script = ScriptCommand::makeRegRpcSrvCmd(_env, dName, dSpec, nullptr); + script.doRequest(); + } return; } diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 42debe1556c..8582253c485 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -99,13 +99,13 @@ ConfigTask::PerformTask() SBEnv::SBEnv(const ConfigShim &shim) : SBEnv(shim, true) {} -SBEnv::SBEnv(const ConfigShim &shim, bool) +SBEnv::SBEnv(const ConfigShim &shim, bool useNewConsensusLogic) : _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(true), + _useNewLogic(useNewConsensusLogic), _partnerList(), _me(createSpec(_configShim.portNumber())), _rpcHooks(*this, _rpcsrvmap, _rpcsrvmanager), |