From 332533b1c958c24470bc4d9238216bcd431db901 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 14 Feb 2024 00:55:36 -0700 Subject: [PATCH] Fix default request channel timeout regression --- changelog/66061.fixed.md | 2 ++ salt/config/__init__.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelog/66061.fixed.md diff --git a/changelog/66061.fixed.md b/changelog/66061.fixed.md new file mode 100644 index 00000000000..1735b25b2a4 --- /dev/null +++ b/changelog/66061.fixed.md @@ -0,0 +1,2 @@ +Fix request channel default timeout regression. In 3006.5 it was changed from +60 to 30 and is now set back to 60 by default. diff --git a/salt/config/__init__.py b/salt/config/__init__.py index 688cc5ea455..95a4de9e09a 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -1057,7 +1057,7 @@ DEFAULT_MINION_OPTS = immutabletypes.freeze( "pillar_cache": False, "pillar_cache_ttl": 3600, "pillar_cache_backend": "disk", - "request_channel_timeout": 30, + "request_channel_timeout": 60, "request_channel_tries": 3, "gpg_cache": False, "gpg_cache_ttl": 86400,