diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-08-16 12:58:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-16 12:58:02 +0200 |
commit | 2fd9cd8cee954a7ecd7a828c96f7a7cfc8a2f7be (patch) | |
tree | 5d729e9dfba6cc9856d851f9df9182b4cd2cfa5a /slobrok | |
parent | a60caa2c0de45a19bcc2cfb2a05632629e21ba46 (diff) |
Revert "Arnej/wire consensus map"
Diffstat (limited to 'slobrok')
5 files changed, 8 insertions, 24 deletions
diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp index 7e693a9ea3d..632c823a2c1 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp @@ -39,7 +39,6 @@ ExchangeManager::addPartner(const std::string & name, const std::string & spec) auto [ it, wasNew ] = _partners.emplace(name, std::make_unique<RemoteSlobrok>(name, spec, *this)); LOG_ASSERT(wasNew); RemoteSlobrok & partner = *it->second; - partner.remoteMap().registerListener(_env.consensusMap()); partner.tryConnect(); return OkState(); } @@ -52,7 +51,6 @@ ExchangeManager::removePartner(const std::string & name) LOG_ASSERT(oldremote); _partners.erase(name); oldremote->shutdown(); - oldremote->remoteMap().unregisterListener(_env.consensusMap()); } std::vector<std::string> diff --git a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp index 7141da29b6d..50a11c7b521 100644 --- a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp +++ b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp @@ -9,11 +9,9 @@ namespace slobrok { LocalRpcMonitorMap::LocalRpcMonitorMap(FRT_Supervisor &supervisor) : _map(), - _dispatcher(), _history(), _supervisor(supervisor) { - _dispatcher.registerListener(_history); } LocalRpcMonitorMap::~LocalRpcMonitorMap() = default; @@ -48,7 +46,7 @@ void LocalRpcMonitorMap::add(const ServiceMapping &mapping) { mapping.name.c_str(), mapping.spec.c_str(), exists.name().c_str(), exists.spec().c_str()); if (exists.up) { - _dispatcher.remove(exists.mapping()); + _history.remove(exists.mapping()); } _map.erase(old); } @@ -71,10 +69,9 @@ void LocalRpcMonitorMap::remove(const ServiceMapping &mapping) { mapping.name.c_str(), exists.spec().c_str(), mapping.spec.c_str()); - return; } if (exists.up) { - _dispatcher.remove(exists.mapping()); + _history.remove(exists.mapping()); } _map.erase(iter); } else { @@ -91,7 +88,7 @@ void LocalRpcMonitorMap::notifyFailedRpcSrv(ManagedRpcServer *rpcsrv, std::strin LOG(debug, "failed: %s->%s", mapping.name.c_str(), mapping.spec.c_str()); if (psd->up) { psd->up = false; - _dispatcher.remove(mapping); + _history.remove(mapping); } } @@ -103,7 +100,7 @@ void LocalRpcMonitorMap::notifyOkRpcSrv(ManagedRpcServer *rpcsrv) { LOG(debug, "ok: %s->%s", mapping.name.c_str(), mapping.spec.c_str()); if (! psd->up) { psd->up = true; - _dispatcher.add(mapping); + _history.add(mapping); } } diff --git a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h index 7d3ed6b466a..3f732d6875b 100644 --- a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h +++ b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.h @@ -1,16 +1,14 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "map_listener.h" +#include "map_source.h" +#include "service_mapping.h" +#include "service_map_history.h" #include "i_rpc_server_manager.h" #include "managed_rpc_server.h" #include "map_listener.h" -#include "map_listener.h" -#include "map_source.h" #include "named_service.h" -#include "proxy_map_source.h" -#include "service_map_history.h" -#include "service_mapping.h" - #include <vector> #include <memory> #include <map> @@ -39,7 +37,6 @@ private: using Map = std::map<vespalib::string, PerService>; Map _map; - ProxyMapSource _dispatcher; ServiceMapHistory _history; FRT_Supervisor &_supervisor; @@ -49,7 +46,6 @@ public: LocalRpcMonitorMap(FRT_Supervisor &_supervisor); ~LocalRpcMonitorMap(); - MapSource &dispatcher() { return _dispatcher; } ServiceMapHistory & history(); void add(const ServiceMapping &mapping) override; diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index bf7466bb397..6bf5bbd985d 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -118,7 +118,6 @@ SBEnv::SBEnv(const ConfigShim &shim) srandom(time(nullptr) ^ getpid()); _rpcsrvmap.proxy().registerListener(_globalVisibleHistory); _rpcsrvmap.proxy().registerListener(_localRpcMonitorMap); - _localRpcMonitorMap.dispatcher().registerListener(_consensusMap); _rpcHooks.initRPC(getSupervisor()); } diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h index 18ac40c2ba7..853e72e83c5 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.h +++ b/slobrok/src/vespa/slobrok/server/sbenv.h @@ -10,7 +10,6 @@ #include "ok_state.h" #include "local_rpc_monitor_map.h" #include "metrics_producer.h" -#include "union_service_map.h" #include <vespa/config-slobroks.h> #include <vespa/slobrok/cfg.h> #include <vespa/vespalib/net/simple_health_producer.h> @@ -57,7 +56,6 @@ private: MetricsProducer _metrics; vespalib::SimpleComponentConfigProducer _components; LocalRpcMonitorMap _localRpcMonitorMap; - UnionServiceMap _consensusMap; ServiceMapHistory _globalVisibleHistory; public: @@ -84,10 +82,6 @@ public: return _localRpcMonitorMap.history(); } - UnionServiceMap& consensusMap() { - return _consensusMap; - } - const std::string & mySpec() const { return _me; } bool isSuspended() const { return false; } |