Merge pull request #2681 from yahoo/balder/restart-on-messagebus-port-change

Balder/restart on messagebus port change

8 files changed, 19 insertions, 13 deletions

diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp
index 57c4b62cddb..2235cf3e342 100644
--- a/searchcore/src/apps/proton/proton.cpp
+++ b/searchcore/src/apps/proton/proton.cpp
@@ -9,6 +9,7 @@
 #include <vespa/vespalib/util/signalhandler.h>
 #include <vespa/vespalib/util/programoptions.h>
 #include <vespa/vespalib/io/fileutil.h>
+#include <vespa/config/common/exceptions.h>
 #include <vespa/fastos/app.h>
 
 #include <string>
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
index 5731700a55f..46250301c18 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
@@ -6,6 +6,7 @@
 #include <vespa/config-rank-profiles.h>
 #include <vespa/config/config.h>
 #include <vespa/config/helper/legacy.h>
+#include <vespa/config/common/exceptions.h>
 #include <vespa/eval/eval/tensor_spec.h>
 #include <vespa/eval/eval/value_cache/constant_value.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
index 423a3f509c0..59f0635d56a 100644
--- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
+++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp
@@ -18,6 +18,7 @@
 #include <vespa/vespalib/util/slaveproc.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/objects/nbostream.h>
+#include <vespa/config/common/exceptions.h>
 #include <vespa/config/helper/configgetter.hpp>
 
 #include <iostream>
diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
index 58844dc969c..7aa4bf908f2 100644
--- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
+++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
@@ -3,6 +3,7 @@
 #include <vespa/slobrok/sbmirror.h>
 #include <vespa/config-slobroks.h>
 #include <vespa/config/common/configsystem.h>
+#include <vespa/config/common/exceptions.h>
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/vespalib/util/host_name.h>
 #include <vespa/vespalib/util/stringfmt.h>
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')",
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
index b5d76c3f60a..44a99395427 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
@@ -2,10 +2,12 @@
 
 #include "proton_config_fetcher.h"
 #include "bootstrapconfig.h"
-#include <vespa/vespalib/util/exceptions.h>
-#include <thread>
 #include "proton_config_snapshot.h"
 #include "i_proton_configurer.h"
+#include <vespa/config/common/exceptions.h>
+#include <vespa/vespalib/util/exceptions.h>
+#include <thread>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.proton_config_fetcher");