Revert "Revert "Avoid safe mutations in master moratorium and increase first cluster state broadcast deadline [run-systemtest]""

1 files changed, 5 insertions, 2 deletions

diff --git a/configdefinitions/src/vespa/fleetcontroller.def b/configdefinitions/src/vespa/fleetcontroller.def
index d2d746363f0..08fbed7f263 100644
--- a/configdefinitions/src/vespa/fleetcontroller.def
+++ b/configdefinitions/src/vespa/fleetcontroller.def
@@ -115,8 +115,11 @@ cycle_wait_time double default=0.1
 ## a new fleetcontroller. (Will broadcast earlier than this if we have gathered
 ## state from all before this). To prevent disturbance when taking over as
 ## fleetcontroller, give nodes a bit of time to answer so we dont temporarily
-## report nodes as down.
-min_time_before_first_system_state_broadcast double default=5.0
+## report nodes as down.  The time before the first broadcast may be increased
+## further by other settings like max_slobrok_disconnect_grace_period and
+## get_node_state_request_timeout, but may be shorter if all nodes have
+## reported their state.
+min_time_before_first_system_state_broadcast double default=120.0
 
 ## Request timeout of node state requests. Keeping a high timeout allows us to
 ## always have a pending operation with very low cost. Keeping a low timeout is