Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2023-01-20 17:38:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Fri Jan 20 17:38:09 2023 rev:135 rq:1059578 version:3005.1 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2023-01-14 00:02:47.749563446 +0100 +++ /work/SRC/openSUSE:Factory/.salt.new.32243/salt.changes 2023-01-20 17:38:11.704360228 +0100 @@ -1,0 +2,8 @@ +Tue Jan 17 16:32:12 UTC 2023 - Pablo Suárez Hernández <pablo.suarezhernan...@suse.com> + +- Control the collection of lvm grains via config (bsc#1204939) + +- Added: + * control-the-collection-of-lvm-grains-via-config.patch + +------------------------------------------------------------------- New: ---- control-the-collection-of-lvm-grains-via-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.GmEQYM/_old 2023-01-20 17:38:13.368369432 +0100 +++ /var/tmp/diff_new_pack.GmEQYM/_new 2023-01-20 17:38:13.372369454 +0100 @@ -301,6 +301,8 @@ Patch77: fixes-for-python-3.10-502.patch # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/62854 Patch78: allow-entrypoint-compatibility-for-importlib-metadat.patch +# PATCH-FIX-OPENSUSE: https://github.com/openSUSE/salt/pull/571 +Patch79: control-the-collection-of-lvm-grains-via-config.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.GmEQYM/_old 2023-01-20 17:38:13.444369852 +0100 +++ /var/tmp/diff_new_pack.GmEQYM/_new 2023-01-20 17:38:13.448369874 +0100 @@ -1,3 +1,3 @@ -100135e8eac75cc18e3e66fc99bbeed9f5592e88 +02c119f814533eed60bd687a8d17286ef75dd94c (No newline at EOF) ++++++ control-the-collection-of-lvm-grains-via-config.patch ++++++ >From 0df204fb1ea7135ce0196f99a864d3f94bd6f92e Mon Sep 17 00:00:00 2001 From: Alexander Graul <agr...@suse.com> Date: Tue, 10 Jan 2023 15:04:01 +0100 Subject: [PATCH] Control the collection of lvm grains via config lvm grain collection can take a long time on systems with a lot of volumes and volume groups. On one server we measured ~3 minutes, which is way too long for grains. This change is backwards-compatible, leaving the lvm grain collection enabled by default. Users with a lot of lvm volumes/volume groups can disable these grains in the minion config by setting enable_lvm_grains: False --- salt/grains/lvm.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/grains/lvm.py b/salt/grains/lvm.py index 586b187ddb..f5c406cb44 100644 --- a/salt/grains/lvm.py +++ b/salt/grains/lvm.py @@ -17,6 +17,10 @@ __salt__ = { log = logging.getLogger(__name__) +def __virtual__(): + return __opts__.get("enable_lvm_grains", True) + + def lvm(): """ Return list of LVM devices -- 2.37.3
