aboutsummaryrefslogtreecommitdiffstats
path: root/slobrok
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2021-09-10 18:39:58 +0000
committerArne H Juul <arnej@yahooinc.com>2021-09-10 18:39:58 +0000
commit0d4bcefc44958000573c272de17b0ddb3bc84eb8 (patch)
treea45e83d87644aae2c9f41a7bb475918883e25ffe /slobrok
parent273a38ad1b65ea59bcff4ea49c5b820ae64928ce (diff)
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
Diffstat (limited to 'slobrok')
-rw-r--r--slobrok/src/vespa/slobrok/server/rpchooks.cpp10
1 files changed, 2 insertions, 8 deletions
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;
}