Use a single overall timeout for file resolving of 1 hour instead of 3 separate each 10m.

2 files changed, 2 insertions, 5 deletions

diff --git a/config/src/vespa/config/file_acquirer/file_acquirer.cpp b/config/src/vespa/config/file_acquirer/file_acquirer.cpp
index 9cf280566e0..048e9544dab 100644
--- a/config/src/vespa/config/file_acquirer/file_acquirer.cpp
+++ b/config/src/vespa/config/file_acquirer/file_acquirer.cpp
@@ -5,7 +5,6 @@
 #include <vespa/fnet/frt/target.h>
 #include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/fnet/transport.h>
-#include <vespa/vespalib/util/size_literals.h>
 #include <vespa/fastos/thread.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
index 4e272e1af4c..8cc64f1b0de 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
@@ -319,7 +319,7 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot
     MaintenanceConfigSP newMaintenanceConfig;
     std::shared_ptr<const ThreadingServiceConfig> old_threading_service_config;
     std::shared_ptr<const AllocConfig> old_alloc_config;
-    constexpr vespalib::duration file_resolve_timeout = 60s * 10;
+    constexpr vespalib::duration file_resolve_timeout = 60min;
 
     if (!_ignoreForwardedConfig) {
         if (!(_bootstrapConfig->getDocumenttypesConfigSP() &&
@@ -352,6 +352,7 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot
     if (snapshot.isChanged<RankProfilesConfig>(_configId, currentGeneration)) {
         newRankProfilesConfig = snapshot.getConfig<RankProfilesConfig>(_configId);
     }
+    vespalib::TimeBox timeBox(vespalib::to_s(file_resolve_timeout), 5);
     if (snapshot.isChanged<RankingConstantsConfig>(_configId, currentGeneration)) {
         RankingConstantsConfigSP newRankingConstantsConfig = RankingConstantsConfigSP(
                 snapshot.getConfig<RankingConstantsConfig>(_configId));
@@ -359,7 +360,6 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot
         RankingConstants::Vector constants;
         if (spec != "") {
             config::RpcFileAcquirer fileAcquirer(transport, spec);
-            vespalib::TimeBox timeBox(vespalib::to_s(file_resolve_timeout), 5);
             for (const RankingConstantsConfig::Constant &rc : newRankingConstantsConfig->constant) {
                 auto desc = fmt("name='%s', type='%s'", rc.name.c_str(), rc.type.c_str());
                 vespalib::string filePath = resolve_file(fileAcquirer, timeBox, desc, rc.fileref);
@@ -375,7 +375,6 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot
         RankingExpressions expressions;
         if (spec != "") {
             config::RpcFileAcquirer fileAcquirer(transport, spec);
-            vespalib::TimeBox timeBox(vespalib::to_s(file_resolve_timeout), 5);
             for (const RankingExpressionsConfig::Expression &rc : newRankingExpressionsConfig->expression) {
                 auto desc = fmt("name='%s'", rc.name.c_str());
                 vespalib::string filePath = resolve_file(fileAcquirer, timeBox, desc, rc.fileref);
@@ -391,7 +390,6 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot
         OnnxModels::Vector models;
         if (spec != "") {
             config::RpcFileAcquirer fileAcquirer(transport, spec);
-            vespalib::TimeBox timeBox(vespalib::to_s(file_resolve_timeout), 5);
             for (const OnnxModelsConfig::Model &rc : newOnnxModelsConfig->model) {
                 auto desc = fmt("name='%s'", rc.name.c_str());
                 vespalib::string filePath = resolve_file(fileAcquirer, timeBox, desc, rc.fileref);