Let default max timeout be 600s

2 files changed, 6 insertions, 3 deletions

diff --git a/storage/src/vespa/storage/storageserver/statemanager.cpp b/storage/src/vespa/storage/storageserver/statemanager.cpp
index c838885aadf..a9a2c29a5a6 100644
--- a/storage/src/vespa/storage/storageserver/statemanager.cpp
+++ b/storage/src/vespa/storage/storageserver/statemanager.cpp
@@ -23,6 +23,10 @@ LOG_SETUP(".state.manager");
 
 namespace storage {
 
+namespace {
+    constexpr vespalib::duration MAX_TIMEOUT = 600s;
+}
+
 struct StateManager::StateManagerMetrics : metrics::MetricSet {
     metrics::DoubleAverageMetric invoke_state_listeners_latency;
 
@@ -402,7 +406,7 @@ StateManager::onGetNodeState(const api::GetNodeStateCommand::SP& cmd)
             && is_up_to_date)
         {
             vespalib::duration timeout = cmd->getTimeout();
-            if (timeout == vespalib::duration::max()) timeout = 24h; //balder: Dirty temporary hack
+            if (timeout == vespalib::duration::max()) timeout = MAX_TIMEOUT;
 
             LOG(debug, "Received get node state request with timeout of %f seconds. Scheduling to be answered in "
                        "%f seconds unless a node state change happens before that time.",
diff --git a/vdslib/src/vespa/vdslib/state/nodestate.cpp b/vdslib/src/vespa/vdslib/state/nodestate.cpp
index d86a6dee773..3fc33862e6f 100644
--- a/vdslib/src/vespa/vdslib/state/nodestate.cpp
+++ b/vdslib/src/vespa/vdslib/state/nodestate.cpp
@@ -62,8 +62,7 @@ NodeState::NodeState(vespalib::stringref serialized, const NodeType* type)
 
     vespalib::StringTokenizer st(serialized, " \t\f\r\n");
     st.removeEmptyTokens();
-    for (auto token : st)
-    {
+    for (auto token : st) {
         std::string::size_type index = token.find(':');
         if (index == std::string::npos) {
             throw IllegalArgumentException("Token " + token + " does not contain ':': " + serialized, VESPA_STRLOC);