From c1e19e4bddd13425aba45733372f2a676506256c Mon Sep 17 00:00:00 2001 From: Geoffroy Doucet Date: Tue, 4 Apr 2023 11:02:41 -0400 Subject: [PATCH] Fix getting timeout for get mounts facts on Linux (#79847) * Fix how to get the gather_timeout setting while getting the mounts facts on Linux. Issue: #79844 --- changelogs/fragments/79844-fix-timeout-mounts-linux.yml | 2 ++ lib/ansible/module_utils/facts/hardware/linux.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/79844-fix-timeout-mounts-linux.yml diff --git a/changelogs/fragments/79844-fix-timeout-mounts-linux.yml b/changelogs/fragments/79844-fix-timeout-mounts-linux.yml new file mode 100644 index 00000000000..11d59705a67 --- /dev/null +++ b/changelogs/fragments/79844-fix-timeout-mounts-linux.yml @@ -0,0 +1,2 @@ +bugfixes: + - setup gather_timeout - Fix timeout in get_mounts_facts for linux. diff --git a/lib/ansible/module_utils/facts/hardware/linux.py b/lib/ansible/module_utils/facts/hardware/linux.py index a91c1500bbe..18453abc09a 100644 --- a/lib/ansible/module_utils/facts/hardware/linux.py +++ b/lib/ansible/module_utils/facts/hardware/linux.py @@ -550,7 +550,7 @@ class LinuxHardware(Hardware): # start threads to query each mount results = {} pool = ThreadPool(processes=min(len(mtab_entries), cpu_count())) - maxtime = globals().get('GATHER_TIMEOUT') or timeout.DEFAULT_GATHER_TIMEOUT + maxtime = timeout.GATHER_TIMEOUT or timeout.DEFAULT_GATHER_TIMEOUT for fields in mtab_entries: # Transform octal escape sequences fields = [self._replace_octal_escapes(field) for field in fields]