diff options
| author | Arne H Juul <arnej@yahooinc.com> | 2021-09-16 08:57:32 +0000 |
|---|---|---|
| committer | Arne H Juul <arnej@yahooinc.com> | 2021-09-16 08:57:32 +0000 |
| commit | 5a99a68293d1a4b5f56e71e81b04398c2a3c967c (patch) | |
| tree | 7ea9881e1a36b4a57a1579e3e4f9d62fee28cb27 /slobrok | |
| parent | df4b89dd426dd3b1551ebd9c26706d2f580a528a (diff) | |
always run with new logic
* we decided to avoid any warnings on unregister, so
update unit test accordingly.
Diffstat (limited to 'slobrok')
| -rw-r--r-- | slobrok/src/tests/standalone/standalone.cpp | 4 | ||||
| -rw-r--r-- | slobrok/src/vespa/slobrok/server/sbenv.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/slobrok/src/tests/standalone/standalone.cpp b/slobrok/src/tests/standalone/standalone.cpp index 883aeed1494..bee3bed71c3 100644 --- a/slobrok/src/tests/standalone/standalone.cpp +++ b/slobrok/src/tests/standalone/standalone.cpp @@ -281,13 +281,13 @@ TEST("standalone") { ASSERT_TRUE(req->GetReturn()->GetValue(0)._string_array._len == 0); ASSERT_TRUE(req->GetReturn()->GetValue(1)._string_array._len == 0); - // unregister server A (wrong spec) + // unregister server A (wrong spec, but we decided that is not an error) req = orb.AllocRPCRequest(req); req->SetMethodName("slobrok.unregisterRpcServer"); req->GetParams()->AddString("A"); req->GetParams()->AddString("tcp/localhost:18543"); sb->InvokeSync(req, 5.0); - ASSERT_TRUE(req->IsError()); + ASSERT_FALSE(req->IsError()); // lookup 'A' should give 'A' req = orb.AllocRPCRequest(req); diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index ebb9935877f..4bd55ee67f4 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -97,15 +97,15 @@ ConfigTask::PerformTask() } // namespace slobrok::<unnamed> -SBEnv::SBEnv(const ConfigShim &shim) : SBEnv(shim, false) {} +SBEnv::SBEnv(const ConfigShim &shim) : SBEnv(shim, true) {} -SBEnv::SBEnv(const ConfigShim &shim, bool useNewConsensusLogic) +SBEnv::SBEnv(const ConfigShim &shim, bool) : _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), + _useNewLogic(true), _partnerList(), _me(createSpec(_configShim.portNumber())), _rpcHooks(*this, _rpcsrvmap, _rpcsrvmanager), |