diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-09-20 10:23:06 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-09-20 10:28:52 +0000 |
commit | 727569fcc19f2e0543f56e6d421ed1ce6c2b5c75 (patch) | |
tree | 5d71a0b17ff1ea225f511a317dd6a54ee42bed4e /slobrok | |
parent | 89b0b2efb6d2674363113c99ab440e4cbb811683 (diff) |
simplify more
Diffstat (limited to 'slobrok')
-rw-r--r-- | slobrok/src/vespa/slobrok/server/exchange_manager.cpp | 14 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/exchange_manager.h | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp index a62db2ed35d..89167842c1b 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp @@ -189,7 +189,9 @@ ExchangeManager::WorkPackage::doneItem(bool denied) (int)_doneCnt, (int)_work.size(), (int)_numDenied); if (_doneCnt == _work.size()) { if (_numDenied > 0) { - LOG(debug, "work package: %zd/%zd denied by remote", _numDenied, _doneCnt); + LOG(debug, "work package [%s->%s]: %zd/%zd denied by remote", + _mapping.name.c_str(), _mapping.spec.c_str(), + _numDenied, _doneCnt); } delete this; } @@ -206,14 +208,8 @@ ExchangeManager::WorkPackage::addItem(RemoteSlobrok *partner) const char *spec_p = _mapping.spec.c_str(); FRT_RPCRequest *r = _exchanger._env.getSupervisor()->AllocRPCRequest(); - // XXX should recheck rpcsrvmap again - if (_optype == OP_REMOVE) { - r->SetMethodName("slobrok.internal.doRemove"); - } else if (_optype == OP_WANTADD) { - r->SetMethodName("slobrok.internal.wantAdd"); - } else if (_optype == OP_DOADD) { - r->SetMethodName("slobrok.internal.doAdd"); - } + LOG_ASSERT(_optype == OP_REMOVE); + r->SetMethodName("slobrok.internal.doRemove"); r->GetParams()->AddString(_exchanger._env.mySpec().c_str()); r->GetParams()->AddString(name_p); r->GetParams()->AddString(spec_p); diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.h b/slobrok/src/vespa/slobrok/server/exchange_manager.h index e1344bff722..6891686c94d 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.h +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.h @@ -60,7 +60,7 @@ private: size_t _numDenied; public: ExchangeManager &_exchanger; - enum op_type { OP_NOP, OP_WANTADD, OP_DOADD, OP_REMOVE }; + enum op_type { OP_REMOVE }; const ServiceMapping _mapping; const op_type _optype; void addItem(RemoteSlobrok *partner); |