diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-08 13:27:29 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-08 13:28:18 +0200 |
commit | a222a37083bf74b4b2992e91a4ec90921b0cc2bf (patch) | |
tree | 1cac7aa9d5b476b4ec03c1e43866baa9b34b2393 /searchcore | |
parent | 25809a32e2a9227d92e355483984e9ba592358f4 (diff) |
Only include what you really need
Diffstat (limited to 'searchcore')
3 files changed, 11 insertions, 11 deletions
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp index ed5e069c3ee..a99707bc275 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp @@ -5,7 +5,8 @@ #include "datasetcollection.h" #include "plain_dataset.h" #include "engine_base.h" -#include <vespa/searchcore/fdispatch/common/appcontext.h> +#include <vespa/config/common/exceptions.h> +#include <set> #include <vespa/log/log.h> LOG_SETUP(".search.nodemanager"); @@ -16,9 +17,10 @@ FastS_NodeManager::configure(std::unique_ptr<PartitionsConfig> cfg) LOG(config, "configuring datasetcollection from '%s'", _configUri.getConfigId().c_str()); SetPartMap(*cfg, 2000); - _componentConfig.addConfig(vespalib::ComponentConfigProducer::Config("fdispatch.nodemanager", - _fetcher->getGeneration(), - "will not update generation unless config has changed")); + _componentConfig.addConfig( + vespalib::ComponentConfigProducer::Config("fdispatch.nodemanager", + _fetcher->getGeneration(), + "will not update generation unless config has changed")); } @@ -26,15 +28,11 @@ class AdminBadEngines { std::set<vespalib::string> _bad; public: - void - addAdminBad(const vespalib::string &name) - { + void addAdminBad(const vespalib::string &name) { _bad.insert(name); } - bool - isAdminBad(const vespalib::string &name) const - { + bool isAdminBad(const vespalib::string &name) const { return _bad.find(name) != _bad.end(); } }; diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h index 1d2aa617f35..47d06033175 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h @@ -7,6 +7,7 @@ #include <vespa/config/helper/configfetcher.h> #include <vespa/searchcore/fdispatch/common/queryperf.h> #include <vespa/vespalib/net/simple_component_config_producer.h> +#include <vespa/config/subscription/configuri.h> using vespa::config::search::core::PartitionsConfig; diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp index 8c737f26af7..a678678edd0 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp @@ -13,6 +13,7 @@ #include <vespa/searchsummary/config/config-juniperrc.h> #include <vespa/searchcore/config/config-ranking-constants.h> #include <vespa/vespalib/time/time_box.h> +#include <thread> LOG_SETUP(".proton.server.documentdbconfigmanager"); @@ -217,7 +218,7 @@ DocumentDBConfigManager::update(const ConfigSnapshot &snapshot) while (timeBox.hasTimeLeft() && (filePath == "")) { filePath = fileAcquirer.wait_for(rc.fileref, timeBox.timeLeft()); if (filePath == "") { - FastOS_Thread::Sleep(100); + std::this_thread::sleep_for(std::chrono::milliseconds(100)); } } LOG(info, "Got file path from file acquirer: '%s' (name='%s', type='%s', ref='%s')", |