From 1e37a62f64b2d6b4d77d9c79050e5307b3036658 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Tue, 30 Mar 2021 11:56:48 +0000 Subject: [PATCH] Add 2 minute timeout for repoquery We encountered an issue when repoquery took several minutes which has lead to timeouts and unfinished log collections. To avoid that this commit adds a timeout which is basically a fail-safe from collect_logs point of view. The patch replaces for loop for record_available_packages command by a single command. Change-Id: Ie3007414aac14db47696fca62b07e1efa4e1de16 --- roles/collect_logs/defaults/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/collect_logs/defaults/main.yml b/roles/collect_logs/defaults/main.yml index 20f1507..ee46b4d 100644 --- a/roles/collect_logs/defaults/main.yml +++ b/roles/collect_logs/defaults/main.yml @@ -219,10 +219,11 @@ artcl_commands: cmd: "{{ ansible_pkg_mgr }} module list --enabled" when: ansible_distribution_major_version|int >= 8 record_available_packages: + # the timeout is like a fail-safe from collect_logs point of view, + # we encountered an issue when repolist query took several minutes + # which lead to timeouts and unfinished log collections cmd: | - for i in `{{ ansible_pkg_mgr }} repolist enabled -v | grep Repo-id | awk '{print $3}' | awk -F / '{print $1}'`;do - repoquery --repoid $i -a - done + timeout 120 repoquery -a --qf "%{ui_from_repo} %{name}" | sort capture_file: /var/log/extra/all_available_packages.txt selinux: cmd: |