From 0d4bcefc44958000573c272de17b0ddb3bc84eb8 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Fri, 10 Sep 2021 18:39:58 +0000 Subject: avoid spurious error * last changes triggered this warning: slobrok.unregisterRpcServer(foo -> tcp/bar:4294967295) failed: conflict detected * why it wants to unregister "-1" as port number is unclear, but it's a no-op anyway --- slobrok/src/vespa/slobrok/server/rpchooks.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'slobrok/src') diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp index 33dd154dffe..ab1d5246ddc 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp +++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp @@ -321,15 +321,9 @@ void RPCHooks::new_unregisterRpcServer(FRT_RPCRequest *req) { const char *dName = args[0]._string._str; const char *dSpec = args[1]._string._str; ServiceMapping mapping{dName, dSpec}; - bool ok = ! _env.consensusMap().wouldConflict(mapping); - if (! ok) { - req->SetError(FRTE_RPC_METHOD_FAILED, "conflict detected"); - } _env.localMonitorMap().removeLocal(mapping); _env.exchangeManager().forwardRemove(dName, dSpec); - LOG(debug, "unregisterRpcServer(%s,%s) %s", - dName, dSpec, - ok ? "OK" : "failed"); + LOG(debug, "unregisterRpcServer(%s,%s)", dName, dSpec); _cnts.otherReqs++; return; } @@ -509,7 +503,7 @@ void RPCHooks::new_doAdd(FRT_RPCRequest *req) { } LOG(debug, "%s->doAdd(%s,%s) %s", remsb, dName, dSpec, ok ? "OK" : "failed"); - _cnts.wantAddReqs++; + _cnts.doAddReqs++; return; } -- cgit v1.2.3