From 458b887df1064a9d508b916977128ea035457e01 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Thu, 24 Apr 2025 16:22:17 -0700 Subject: [PATCH] Lower listen/connect retry intervals in Broker and the cluster framework to 1sec The former defaults (30sec, 1min) can slow down cluster startup and recovery considerably, and other systems have more aggressive intervals still. (cherry picked from commit 68fadd04641e16ba433f8305bd1511281ae33cfd) --- scripts/base/frameworks/broker/main.zeek | 4 ++-- scripts/base/frameworks/cluster/main.zeek | 2 +- testing/btest/broker/telemetry.zeek | 1 - testing/btest/scripts/policy/misc/weird-stats-cluster.zeek | 4 ---- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/base/frameworks/broker/main.zeek b/scripts/base/frameworks/broker/main.zeek index 91168957a2..c67a4922b5 100644 --- a/scripts/base/frameworks/broker/main.zeek +++ b/scripts/base/frameworks/broker/main.zeek @@ -19,7 +19,7 @@ export { ## use already. Use of the ZEEK_DEFAULT_LISTEN_RETRY environment variable ## (set as a number of seconds) will override this option and also ## any values given to :zeek:see:`Broker::listen`. - const default_listen_retry = 30sec &redef; + const default_listen_retry = 1sec &redef; ## Default address on which to listen. ## @@ -36,7 +36,7 @@ export { ## ZEEK_DEFAULT_CONNECT_RETRY environment variable (set as number of ## seconds) will override this option and also any values given to ## :zeek:see:`Broker::peer`. - const default_connect_retry = 30sec &redef; + const default_connect_retry = 1sec &redef; ## If true, do not use SSL for network connections. By default, SSL will ## even be used if no certificates / CAs have been configured. In that case diff --git a/scripts/base/frameworks/cluster/main.zeek b/scripts/base/frameworks/cluster/main.zeek index 7ae9218698..36180b1937 100644 --- a/scripts/base/frameworks/cluster/main.zeek +++ b/scripts/base/frameworks/cluster/main.zeek @@ -260,7 +260,7 @@ export { ## Interval for retrying failed connections between cluster nodes. ## If set, the ZEEK_DEFAULT_CONNECT_RETRY (given in number of seconds) ## environment variable overrides this option. - const retry_interval = 1min &redef; + const retry_interval = 1sec &redef; ## When using broker-enabled cluster framework, nodes broadcast this event ## to exchange their user-defined name along with a string that uniquely diff --git a/testing/btest/broker/telemetry.zeek b/testing/btest/broker/telemetry.zeek index b5229bae75..193f6a407f 100644 --- a/testing/btest/broker/telemetry.zeek +++ b/testing/btest/broker/telemetry.zeek @@ -23,7 +23,6 @@ redef Cluster::nodes = { redef exit_only_after_terminate = T; redef Log::enable_local_logging = T; redef Log::default_rotation_interval = 0secs; -redef Cluster::retry_interval = 1sec; function print_metrics(metrics: vector of Telemetry::Metric) { diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek index 2f9aac32e5..07874c316f 100644 --- a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek +++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek @@ -20,10 +20,6 @@ redef Cluster::nodes = { @load misc/weird-stats @load policy/frameworks/cluster/experimental -redef Cluster::retry_interval = 1sec; -redef Broker::default_listen_retry = 1sec; -redef Broker::default_connect_retry = 1sec; - redef Log::enable_local_logging = T; redef Log::default_rotation_interval = 0secs; redef WeirdStats::weird_stat_interval = 5secs;