From fb21f308d18d76520f0208b94d82d31b354bba4c Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 5 Apr 2018 12:57:41 +0200 Subject: Use a reconfigurable stateserver. --- configdefinitions/src/vespa/CMakeLists.txt | 2 + configdefinitions/src/vespa/stateserver.def | 5 +++ slobrok/src/apps/slobrok/slobrok.cpp | 6 +-- slobrok/src/vespa/slobrok/cfg.cpp | 3 -- slobrok/src/vespa/slobrok/server/CMakeLists.txt | 1 + slobrok/src/vespa/slobrok/server/configshim.cpp | 8 ++-- slobrok/src/vespa/slobrok/server/configshim.h | 4 +- .../slobrok/server/reconfigurable_stateserver.cpp | 46 ++++++++++++++++++++++ .../slobrok/server/reconfigurable_stateserver.h | 31 +++++++++++++++ slobrok/src/vespa/slobrok/server/sbenv.cpp | 37 +++++++++-------- slobrok/src/vespa/slobrok/server/sbenv.h | 6 +-- .../src/vespa/vespalib/net/state_server.cpp | 2 +- 12 files changed, 113 insertions(+), 38 deletions(-) create mode 100644 configdefinitions/src/vespa/stateserver.def create mode 100644 slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp create mode 100644 slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index e1e7a5a0c18..d7023e19622 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -74,3 +74,5 @@ vespa_generate_config(configdefinitions zookeepers.def) install_config_definition(zookeepers.def cloud.config.zookeepers.def) vespa_generate_config(configdefinitions bucketspaces.def) install_config_definition(bucketspaces.def vespa.config.content.core.bucketspaces.def) +vespa_generate_config(configdefinitions stateserver.def) +install_config_definition(stateserver.def vespa.config.stateserver.def) diff --git a/configdefinitions/src/vespa/stateserver.def b/configdefinitions/src/vespa/stateserver.def new file mode 100644 index 00000000000..5be221efb49 --- /dev/null +++ b/configdefinitions/src/vespa/stateserver.def @@ -0,0 +1,5 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=vespa.config + +# Port used for serving the state/vN api +httpport int default = 0 diff --git a/slobrok/src/apps/slobrok/slobrok.cpp b/slobrok/src/apps/slobrok/slobrok.cpp index 277cc2f3a87..5a1ddb918ba 100644 --- a/slobrok/src/apps/slobrok/slobrok.cpp +++ b/slobrok/src/apps/slobrok/slobrok.cpp @@ -50,7 +50,6 @@ int App::Main() { uint32_t portnum = 2773; - uint32_t statePort = 0; vespalib::string cfgId; int argi = 1; @@ -61,9 +60,6 @@ App::Main() case 'c': cfgId = std::string(optArg); break; - case 's': - statePort = atoi(optArg); - break; case 'p': portnum = atoi(optArg); break; @@ -79,7 +75,7 @@ App::Main() ConfigShim shim(portnum); mainobj.reset(new SBEnv(shim)); } else { - ConfigShim shim(portnum, statePort, cfgId); + ConfigShim shim(portnum, cfgId); mainobj.reset(new SBEnv(shim)); } hook_sigterm(); diff --git a/slobrok/src/vespa/slobrok/cfg.cpp b/slobrok/src/vespa/slobrok/cfg.cpp index 720fb5df962..a1f165fa7ea 100644 --- a/slobrok/src/vespa/slobrok/cfg.cpp +++ b/slobrok/src/vespa/slobrok/cfg.cpp @@ -1,9 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "cfg.h" -#include -LOG_SETUP(".slobrok.configurator"); - namespace slobrok { namespace { diff --git a/slobrok/src/vespa/slobrok/server/CMakeLists.txt b/slobrok/src/vespa/slobrok/server/CMakeLists.txt index 5ca41967524..a6772404ead 100644 --- a/slobrok/src/vespa/slobrok/server/CMakeLists.txt +++ b/slobrok/src/vespa/slobrok/server/CMakeLists.txt @@ -22,6 +22,7 @@ vespa_add_library(slobrok_slobrokserver slobrokserver.cpp visible_map.cpp metrics_producer.cpp + reconfigurable_stateserver.cpp INSTALL lib64 DEPENDS slobrok diff --git a/slobrok/src/vespa/slobrok/server/configshim.cpp b/slobrok/src/vespa/slobrok/server/configshim.cpp index 83f91a29b30..d312340aceb 100644 --- a/slobrok/src/vespa/slobrok/server/configshim.cpp +++ b/slobrok/src/vespa/slobrok/server/configshim.cpp @@ -5,24 +5,22 @@ namespace slobrok { ConfigShim::ConfigShim(uint32_t port) - : _port(port), _statePort(0), _configId(""), + : _port(port), _configId(""), _factory(config::ConfigUri::createEmpty()) {} -ConfigShim::ConfigShim(uint32_t port, uint32_t statePort_in, const std::string& cfgId) +ConfigShim::ConfigShim(uint32_t port, const std::string& cfgId) : _port(port), - _statePort(statePort_in), _configId(cfgId), _factory(config::ConfigUri(_configId)) {} ConfigShim::ConfigShim(uint32_t port, const std::string& cfgId, config::IConfigContext::SP cfgCtx) : _port(port), - _statePort(0), _configId(cfgId), _factory(config::ConfigUri(cfgId, cfgCtx)) {} -ConfigShim::~ConfigShim() {} +ConfigShim::~ConfigShim() = default; } diff --git a/slobrok/src/vespa/slobrok/server/configshim.h b/slobrok/src/vespa/slobrok/server/configshim.h index ed3c04b6233..40d44985747 100644 --- a/slobrok/src/vespa/slobrok/server/configshim.h +++ b/slobrok/src/vespa/slobrok/server/configshim.h @@ -10,18 +10,16 @@ class ConfigShim { private: uint32_t _port; - uint32_t _statePort; std::string _configId; ConfiguratorFactory _factory; public: ConfigShim(uint32_t port); - ConfigShim(uint32_t port, uint32_t statePort_in, const std::string& cfgId); + ConfigShim(uint32_t port, const std::string& cfgId); ConfigShim(uint32_t port, const std::string& cfgId, config::IConfigContext::SP cfgCtx); ~ConfigShim(); uint32_t portNumber() const { return _port; } - uint32_t statePort() const { return _statePort; } std::string configId() const { return _configId; } const char *id() const { return _configId.c_str(); } const ConfiguratorFactory & factory() const { return _factory; } diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp new file mode 100644 index 00000000000..16cb23f6e05 --- /dev/null +++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp @@ -0,0 +1,46 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +#include "reconfigurable_stateserver.h" +#include +#include +#include + +#include +LOG_SETUP(".reconfigurable_stateserver"); + +using namespace std::chrono_literals; + +namespace slobrok { + +ReconfigurableStateServer::ReconfigurableStateServer(const config::ConfigUri & configUri, + vespalib::HealthProducer & health, + vespalib::MetricsProducer & metrics, + vespalib::ComponentConfigProducer & components) + : _health(health), + _metrics(metrics), + _components(components), + _configFetcher(std::make_unique(configUri.getContext())), + _server() +{ + _configFetcher->subscribe(configUri.getConfigId(), this); + _configFetcher->start(); +} + +ReconfigurableStateServer::~ReconfigurableStateServer() = default; + +void +ReconfigurableStateServer::configure(std::unique_ptr config) +{ + _server.reset(); + for (size_t retryTime(1); !_server && (retryTime < 10); retryTime++) { + try { + _server = std::make_unique(config->httpport, _health, _metrics, _components); + } catch (vespalib::PortListenException & e) { + LOG(warning, "Failed listening to network port(%d) with protocol(%s): '%s', will retry for 60s", + e.get_port(), e.get_protocol().c_str(), e.what()); + std::this_thread::sleep_for(retryTime * 1s); + } + } +} + +} diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h new file mode 100644 index 00000000000..a8747d09bfd --- /dev/null +++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.h @@ -0,0 +1,31 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +#include +#include +#include + +namespace vespalib { + class HealthProducer; + class MetricsProducer; + class ComponentConfigProducer; + class StateServer; +} +namespace slobrok { + +class ReconfigurableStateServer : private config::IFetcherCallback { +public: + ReconfigurableStateServer(const config::ConfigUri & configUri, + vespalib::HealthProducer & healt, + vespalib::MetricsProducer & metrics, + vespalib::ComponentConfigProducer & component); + ~ReconfigurableStateServer(); +private: + void configure(std::unique_ptr config) override; + vespalib::HealthProducer & _health; + vespalib::MetricsProducer & _metrics; + vespalib::ComponentConfigProducer & _components; + std::unique_ptr _configFetcher; + std::unique_ptr _server; +}; + +} diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 002dd2244ca..849615544b0 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -1,20 +1,25 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "reconfigurable_stateserver.h" #include "sbenv.h" #include "selfcheck.h" #include "remote_check.h" -#include -#include #include -#include +#include #include #include #include +#include +#include +#include #include LOG_SETUP(".sbenv"); +using namespace std::chrono_literals; + namespace slobrok { + namespace { void @@ -80,17 +85,16 @@ ConfigTask::PerformTask() } // namespace slobrok:: SBEnv::SBEnv(const ConfigShim &shim) - : _transport(new FNET_Transport()), - _supervisor(new FRT_Supervisor(_transport.get(), NULL)), - _sbPort(shim.portNumber()), - _statePort(shim.statePort()), + : _transport(std::make_unique()), + _supervisor(std::make_unique(_transport.get(), nullptr)), + _configShim(shim), _configurator(shim.factory().create(*this)), _shuttingDown(false), _partnerList(), _me(), _rpcHooks(*this, _rpcsrvmap, _rpcsrvmanager), - _selfchecktask(new SelfCheck(getSupervisor()->GetScheduler(), _rpcsrvmap, _rpcsrvmanager)), - _remotechecktask(new RemoteCheck(getSupervisor()->GetScheduler(), _rpcsrvmap, _rpcsrvmanager, _exchanger)), + _selfchecktask(std::make_unique(getSupervisor()->GetScheduler(), _rpcsrvmap, _rpcsrvmanager)), + _remotechecktask(std::make_unique(getSupervisor()->GetScheduler(), _rpcsrvmap, _rpcsrvmanager, _exchanger)), _health(), _metrics(_rpcHooks, *_transport), _components(), @@ -98,7 +102,7 @@ SBEnv::SBEnv(const ConfigShim &shim) _exchanger(*this, _rpcsrvmap), _rpcsrvmap() { - srandom(time(NULL) ^ getpid()); + srandom(time(nullptr) ^ getpid()); _rpcHooks.initRPC(getSupervisor()); } @@ -158,20 +162,19 @@ toString(const std::vector & v) { int SBEnv::MainLoop() { - vespalib::StateServer stateServer(_statePort, _health, _metrics, _components); + ReconfigurableStateServer stateServer(_configShim.configId(), _health, _metrics, _components); - if (! getSupervisor()->Listen(_sbPort)) { - LOG(error, "unable to listen to port %d", _sbPort); + if (! getSupervisor()->Listen(_configShim.portNumber())) { + LOG(error, "unable to listen to port %d", _configShim.portNumber()); EV_STOPPING("slobrok", "could not listen"); return 1; } else { - LOG(config, "listening on port %d", _sbPort); + LOG(config, "listening on port %d", _configShim.portNumber()); } - std::string myspec = createSpec(_sbPort); + std::string myspec = createSpec(_configShim.portNumber()); - _me.reset(new ManagedRpcServer(myspec.c_str(), myspec.c_str(), - _rpcsrvmanager)); + _me = std::make_unique(myspec.c_str(), myspec.c_str(), _rpcsrvmanager); try { _configurator->poll(); diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h index f96b7540b3a..8c897c9c999 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.h +++ b/slobrok/src/vespa/slobrok/server/sbenv.h @@ -8,10 +8,10 @@ #include "exchange_manager.h" #include "configshim.h" #include "ok_state.h" +#include "metrics_producer.h" #include #include #include -#include "metrics_producer.h" #include class FastOS_ThreadPool; @@ -23,7 +23,6 @@ namespace slobrok { class NamedService; class ManagedRpcServer; -class RemoteRpcServer; class RPCHooks; class SelfCheck; class RemoteCheck; @@ -40,8 +39,7 @@ private: std::unique_ptr _transport; std::unique_ptr _supervisor; - uint32_t _sbPort; - uint32_t _statePort; + ConfigShim _configShim; Configurator::UP _configurator; bool _shuttingDown; diff --git a/staging_vespalib/src/vespa/vespalib/net/state_server.cpp b/staging_vespalib/src/vespa/vespalib/net/state_server.cpp index 61c3e4e6f74..bb81a3aa535 100644 --- a/staging_vespalib/src/vespa/vespalib/net/state_server.cpp +++ b/staging_vespalib/src/vespa/vespalib/net/state_server.cpp @@ -17,6 +17,6 @@ StateServer::StateServer(int port, _server.start(); } -StateServer::~StateServer() {} +StateServer::~StateServer() = default; } // namespace vespalib -- cgit v1.2.3