February 2023 - lvm2-commits - Fedora Mailing-Lists

by Marian Csontos

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f7dd2562c53347cec69... Commit: f7dd2562c53347cec69bc060f838c95839770586 Parent: 993bd2ffc88003aa3392ddbe3364fd887b65b589 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Tue Feb 21 15:33:32 2023 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Tue Feb 21 15:33:32 2023 +0100 pre-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 4 ++-- WHATS_NEW_DM | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 50e9c95ee..5317d59a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.03.19(2)-git (2022-12-22) +2.03.19(2) (2023-02-21) diff --git a/VERSION_DM b/VERSION_DM index 21ef672a5..1f8535376 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.191-git (2022-12-22) +1.02.191 (2023-02-21) diff --git a/WHATS_NEW b/WHATS_NEW index 248e30f5c..b54a092d8 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,4 +1,4 @@ -version 2.03.19 - +version 2.03.19 - 21st February 2023 ==================================== Configure supports --with-systemd-run executed from udev rules. Enhancement for build with MuslC systemd and non-bash system shells (dash). @@ -6,7 +6,7 @@ version 2.03.19 - Ensure udev is processing origin LV before its thick snapshots LVs. Fix and improve runtime memory size detection for VDO volumes. -version 2.03.18 - 22nd december 2022 +version 2.03.18 - 22nd December 2022 ==================================== Fix issues reported by coverity scan. Fix warning for thin pool overprovisioning on lvextend (2.03.17). diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 1f94e5e27..e50a4d131 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,4 +1,4 @@ -Version 1.02.191 - +Version 1.02.191 - 21st February 2023 ===================================== Improve parallel creation of /dev/mapper/control device node. Import previous ID_FS_* udev records in 13-dm-disk.rules for suspended DM dev.

1 year, 2 months

1
0
0 / 0

v2_03_19 annotated tag has been created

by Marian Csontos

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8a84d53c113371f1908... Commit: 8a84d53c113371f1908325dbada488c233f04e97 Parent: 0000000000000000000000000000000000000000 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: 2023-02-21 14:36 +0000 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: 2023-02-21 14:36 +0000 annotated tag: v2_03_19 has been created at 8a84d53c113371f1908325dbada488c233f04e97 (tag) tagging f7dd2562c53347cec69bc060f838c95839770586 (commit) replaces v2_03_18 Release 2.03.19 Bugfix release -----BEGIN PGP SIGNATURE----- iQJIBAABCAAyFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmP01xIUHG1jc29udG9z QHJlZGhhdC5jb20ACgkQuREkMeUJA58w+BAA+rIdyFgCtsELFU/Q/lMPhmhJqxh4 y25qKnlclywQRN/obFum//BC4wyJkk4AgGn/CUmj2SXLCoZgR/pkc5dAacnMPHZ/ 4lpKk7UxfOsPhUu7Arp7w3MSePK0jD+lLVKFpwKdk9wmrlcrL5/Xz+r0tfqoFPaQ l0LH6jPbs8ju4BNAYpfA3ej5YHZ8NxtPBoyUEMK9/OasYZkBmqwcHlx6DXAFikft 7Ql+JiFVT4J36hxxYmQ8e1l7YHGEAd+8Yb6vE4/TlmWUZtEjpasy7g3ClM0r1lQP sHtOIAQKoGaiiczd5+jq1MQtHCatCZskHz+u0Z0UaXpMhkhButjP+orn2h89f5Nt yjT2p5HTHr6CTd6Cl3YX0nMhXdCqwBls4OOVZ08oIXrc+fP16LNrKbhtTBVmRCSJ efQ+LgubHzmA3C6NeL75Y+mXeHy6OzwtLzdFBtEC2cB2moSlxSA22GTQYAyT+cj5 CIhdw33jR+dqP06XG6wChEGdCdnhZUEVYvf7GB0UqH6hPqbE2OBg3WifXEBKvESZ R92KZKY83uyV3m4c3RLiO9RCxmUdU5rQ2Ug8pN7aIi1YhgqD1pQ+odubksOhUOs3 iXyOwiErdunFGeC3HXJq3xwnX3p0rgyFNYhDZ5m/EaDsXSPpyuBWtrRDapf+tTE0 ASy9Y9yjblVnYrk= =nYaZ -----END PGP SIGNATURE----- David Seifert (3): configure.ac: use only portable POSIX shell configure.ac: only use `AS_IF` for conditional blocks configure.ac: only use `AS_CASE` for conditional blocks David Teigland (18): lvresize: fix cryptsetup resize in helper tests: lvresize-fs-crypt using helper only for crypt dev vgimportclone: fix importing PV without metadata tests: vgimportclone with incomplete pv list and nomda pv lvmlockd: fix report of lv_active_exclusively for special lv types lvresize: only resize crypt when fs resize is enabled lvresize: enable crypt resizing with --force Revert "lvresize: enable crypt resizing with --force" lvresize: fail early if mounted LV was renamed lvresize: fail early if crypt device is missing pvscan: use alternate device names from DEVLINKS to check filter vgchange autoactivation: skip regex filter containing symlinks pvscan: recognize "pci" as a common symlink component in filters vg_read: remove unused code for md components device_id: ignore quotes in device id vgimportclone: fix non-duplicate PV with non-unique basevgname arg pvscan: filter does not need to be checked for symlink names pvscan: remove warning about excluded root dev Jory Pratt (1): vgimportdevices: LOCK_EX requires <sys/file.h> include Marian Csontos (5): pre-release post-release lvmlockd: Fix syntax error in previous commit Revert "makefiles: fix grep warning from make" pre-release Peter Rajnoha (2): udev: don't reset SYSTEMD_READY in udev for PVs on MD and loop udev: remove rule for explicit creation of /dev/mapper/control Samanta Navarro (1): doc: fix typos in documentation Tony Asleson (3): lvmdbusd: Fix grammar lvmdbusd: Disable collecting lvm debug data by default lvmdbustest: Check and remove lvm debug collection files Yu Watanabe (1): udev: import previous results of blkid when in suspended state Zdenek Kabelac (64): lvresize: use standard extent conversion function vdo: check memory only in non critical section vdo: read live vdo size configuration vdo: fix and enhance vdo constain checking vdo: resize requires active vdopool volume tests: vdo resizing libdm: correcting ifdef possition makefiles: comment out hiding dir entering makefiles: fix grep warning from make archive: update message device_mapper: reduce unnecessary looping passed device_mapper: reactivate siblings for snapshot debug: compatibility with x32 ABI lv/vgchange: when refreshing whole vg skip snapshot lvm: fix typos metadata-exported.h: correcting definition lvresize: better detection of BLKID_SUBLKS_FSINFO configure.ac: remove some lvmetad leftovers configure.ac: misc updates configure: update lvresize_fs_helper: cleanup shellcheck warns makefiles: keep removing anchient files makefiles: avoid piping tests: fix cutandpaste bug in wrapper tests: remove blank line tests: avoid using length tests: cleanup some shellcheck warns tests: reduce shellcheck warns configure.ac: better blkid test configure.ac: support systemd-run binary path configure: update WHATS_NEW: update configure.ac: check for blkid when required configure: update filesystem: use PATH_MAX for linux paths libdm: improve parallel create of control node libdm: match reactivation of sibling for snapshot WHATS_NEW_DM: update makefiles: use configured systemd library paths makefiles: allow using configure cppflags makefiles: update doc man: update lvmcache cache setting cov: drop unneeded header tests: skip test without mkfs.ext4 tests: use PWD for dbus testing acinclude.m4: add local copy of PKG_CHECK_VAR configure.ac: fix support for LOCKDIDM configure.ac: remove UDEV_SYSTEMD_BACKGROUND_JOBS configure.ac: more cleanup configure: update lvconvert: fix return codes lvconvert: use log_print_unless_silent cov: avoid using strcpy debug: missing backtraces configure.ac: use LIBSYSTEMD configure.ac: use standardized LIBS and CFLAGS configure.ac: fix incorrect check for valid configuration configure.ac: remove unneded vars and settings configure.ac: various minor updates makefiles: move include earlier tests: check failing vdo conversion tests: lvmdbus testing use --debug optinally now tests: safety first... configure: update lilinjie (1): fix typo

1 year, 2 months

1
0
0 / 0

main - lvmdbustest: Check and remove lvm debug collection files

by Tony Asleson

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=993bd2ffc88003aa339... Commit: 993bd2ffc88003aa3392ddbe3364fd887b65b589 Parent: e18d60b336ac881599c1c68d9d3fff1ac8b6515d Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Mon Feb 20 11:10:24 2023 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Mon Feb 20 12:01:53 2023 -0600 lvmdbustest: Check and remove lvm debug collection files In setup/teardown ensure we check for and remove any lvm debug collection, to prevent FS from filling up. --- test/dbus/lvmdbustest.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py index c07963525..685acd563 100755 --- a/test/dbus/lvmdbustest.py +++ b/test/dbus/lvmdbustest.py @@ -13,6 +13,7 @@ import signal # noinspection PyUnresolvedReferences import subprocess import unittest +import tempfile from glob import glob from subprocess import Popen, PIPE @@ -253,6 +254,15 @@ def read_file_build_hash(fn): return rc +def remove_lvm_debug(): + # If we are running the lvmdbusd daemon and collecting lvm debug data, check and + # clean-up after the tests. + tmpdir = tempfile.gettempdir() + for f in glob("lvmdbusd.lvm.debug.*.log", root_dir=tmpdir): + fn = os.path.join(tmpdir, f) + os.unlink(fn) + + class DaemonInfo(object): def __init__(self, pid): # The daemon is running, we have a pid, lets see how it's being run. @@ -417,6 +427,7 @@ class TestDbusService(unittest.TestCase): self.addCleanup(self.clean_up) self.vdo = supports_vdo() + remove_lvm_debug() def _recurse_vg_delete(self, vg_proxy, pv_proxy, nested_pv_hash): vg_name = str(vg_proxy.Vg.Name) @@ -481,6 +492,8 @@ class TestDbusService(unittest.TestCase): # print('Re-creating PV=', p) self._pv_create(p) + remove_lvm_debug() + def _check_consistency(self): # Only do consistency checks if we aren't running the unit tests # concurrently

1 year, 2 months

1
0
0 / 0

main - lvmdbusd: Disable collecting lvm debug data by default

by Tony Asleson

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e18d60b336ac881599c... Commit: e18d60b336ac881599c1c68d9d3fff1ac8b6515d Parent: 5561281f0ac4952ecf7d8657291f2887bb7a2927 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Feb 16 16:07:32 2023 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Mon Feb 20 12:01:53 2023 -0600 lvmdbusd: Disable collecting lvm debug data by default --- daemons/lvmdbusd/cmdhandler.py | 5 ++++- daemons/lvmdbusd/main.py | 3 ++- daemons/lvmdbusd/utils.py | 11 ++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/daemons/lvmdbusd/cmdhandler.py b/daemons/lvmdbusd/cmdhandler.py index c221e5331..ea7e300cf 100644 --- a/daemons/lvmdbusd/cmdhandler.py +++ b/daemons/lvmdbusd/cmdhandler.py @@ -626,8 +626,11 @@ def lvm_full_report_json(): # We are running the fullreport command, we will ask lvm to output the debug # data, so we can have the required information for lvm to debug the fullreport failures. + # Note: this is disabled by default and can be enabled with env. var. + # LVM_DBUSD_COLLECT_LVM_DEBUG=True fn = cfg.lvmdebug.setup() - add_config_option(cmd, "--config", "log {level=7 file=%s syslog=0}" % fn) + if fn is not None: + add_config_option(cmd, "--config", "log {level=7 file=%s syslog=0}" % fn) rc, out, err = call(cmd) # When we have an exported vg the exit code of lvs or fullreport will be 5 diff --git a/daemons/lvmdbusd/main.py b/daemons/lvmdbusd/main.py index 98b235f4e..e8bd3ce0e 100644 --- a/daemons/lvmdbusd/main.py +++ b/daemons/lvmdbusd/main.py @@ -148,6 +148,7 @@ def running_under_systemd(): def main(): start = time.time() use_session = os.getenv('LVM_DBUSD_USE_SESSION', False) + collect_lvm_debug = os.getenv('LVM_DBUSD_COLLECT_LVM_DEBUG', False) # Ensure that we get consistent output for parsing stdout/stderr and that we # are using the lvmdbusd profile. @@ -156,7 +157,7 @@ def main(): # Save off the debug data needed for lvm team to debug issues # only used for 'fullreport' at this time. - cfg.lvmdebug = utils.LvmDebugData() + cfg.lvmdebug = utils.LvmDebugData(collect_lvm_debug) # Indicator if we are running under systemd cfg.systemd = running_under_systemd() diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py index c11737b82..6013b656f 100644 --- a/daemons/lvmdbusd/utils.py +++ b/daemons/lvmdbusd/utils.py @@ -819,9 +819,12 @@ class LvmBug(RuntimeError): class LvmDebugData: - def __init__(self): + def __init__(self, do_collection): self.fd = -1 self.fn = None + self.collect = do_collection + if self.collect: + log_msg("Collecting lvm debug data!") def _remove_file(self): if self.fn is not None: @@ -835,8 +838,10 @@ class LvmDebugData: def setup(self): # Create a secure filename - self.fd, self.fn = tempfile.mkstemp(suffix=".log", prefix="lvmdbusd.lvm.debug.") - return self.fn + if self.collect: + self.fd, self.fn = tempfile.mkstemp(suffix=".log", prefix="lvmdbusd.lvm.debug.") + return self.fn + return None def lvm_complete(self): # Remove the file ASAP, so we decrease our odds of leaving it

1 year, 2 months

1
0
0 / 0

main - lvmdbusd: Fix grammar

by Tony Asleson

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5561281f0ac4952ecf7... Commit: 5561281f0ac4952ecf7d8657291f2887bb7a2927 Parent: a861f0425e0688b2feb97b15277bceb3132d5004 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Feb 16 10:24:06 2023 -0600 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Mon Feb 20 12:01:53 2023 -0600 lvmdbusd: Fix grammar --- daemons/lvmdbusd/automatedproperties.py | 4 ++-- daemons/lvmdbusd/background.py | 2 +- daemons/lvmdbusd/cfg.py | 4 ++-- daemons/lvmdbusd/cmdhandler.py | 4 ++-- daemons/lvmdbusd/job.py | 6 +++--- daemons/lvmdbusd/loader.py | 2 +- daemons/lvmdbusd/lv.py | 4 ++-- daemons/lvmdbusd/main.py | 4 ++-- daemons/lvmdbusd/objectmanager.py | 10 +++++----- daemons/lvmdbusd/request.py | 2 +- daemons/lvmdbusd/utils.py | 6 +++--- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/daemons/lvmdbusd/automatedproperties.py b/daemons/lvmdbusd/automatedproperties.py index be41502bd..5ad6b1d27 100644 --- a/daemons/lvmdbusd/automatedproperties.py +++ b/daemons/lvmdbusd/automatedproperties.py @@ -44,10 +44,10 @@ class AutomatedProperties(dbus.service.Object): def set_interface(self, interface): """ - With inheritance we can't easily tell what interfaces a class provides + With inheritance, we can't easily tell what interfaces a class provides, so we will have each class that implements an interface tell the base AutomatedProperties what it is they do provide. This is kind of - clunky and perhaps we can figure out a better way to do this later. + clunky, and perhaps we can figure out a better way to do this later. :param interface: An interface the object supports :return: """ diff --git a/daemons/lvmdbusd/background.py b/daemons/lvmdbusd/background.py index 50b19c817..7934a33cf 100644 --- a/daemons/lvmdbusd/background.py +++ b/daemons/lvmdbusd/background.py @@ -62,7 +62,7 @@ def _move_callback(job_state, line_str): def _move_merge(interface_name, command, job_state): # We need to execute these command stand alone by forking & exec'ing # the command always as we will be getting periodic output from them on - # the status of the long running operation. + # the status of the long-running operation. meta = LvmExecutionMeta(time.time(), 0, command) cfg.flightrecorder.add(meta) diff --git a/daemons/lvmdbusd/cfg.py b/daemons/lvmdbusd/cfg.py index 70edad846..3ee852855 100644 --- a/daemons/lvmdbusd/cfg.py +++ b/daemons/lvmdbusd/cfg.py @@ -27,13 +27,13 @@ bus = None # Command line args args = None -# Set to true if we are depending on external events for updates +# Set to true if we depend on external events for updates got_external_event = False # Shared state variable across all processes run = multiprocessing.Value('i', 1) -# If this is set to true, the current setup support lvm shell and we are +# If this is set to true, the current setup support lvm shell, and we are # running in that mode of operation SHELL_IN_USE = None diff --git a/daemons/lvmdbusd/cmdhandler.py b/daemons/lvmdbusd/cmdhandler.py index 9a76db4c9..c221e5331 100644 --- a/daemons/lvmdbusd/cmdhandler.py +++ b/daemons/lvmdbusd/cmdhandler.py @@ -109,7 +109,7 @@ def call_lvm(command, debug=False, line_cb=None, stdin, CALL MUST EXECUTE QUICKLY and not *block* otherwise call_lvm function will fail to read stdin/stdout. Return value of call back is ignored - :param cb_data: Supplied to callback to allow caller access to + :param cb_data: Supplied to call back to allow caller access to its own data # Callback signature @@ -213,7 +213,7 @@ def _shell_cfg(): def set_execution(shell): global _t_call with cmd_lock: - # If the user requested lvm shell and we are currently setup that + # If the user requested lvm shell, and we are currently setup that # way, just return if cfg.SHELL_IN_USE and shell: return True diff --git a/daemons/lvmdbusd/job.py b/daemons/lvmdbusd/job.py index 7629cafc7..e6d6cfdf3 100644 --- a/daemons/lvmdbusd/job.py +++ b/daemons/lvmdbusd/job.py @@ -44,7 +44,7 @@ class WaitingClient(object): self.timer_id = GLib.timeout_add_seconds( tmo, WaitingClient._timeout, self) - # The job finished before the timer popped and we are being notified that + # The job finished before the timer popped, and we are being notified that # it's done def notify(self): with self.rlock: @@ -71,7 +71,7 @@ class JobState(object): self._stderr = '' self._waiting_clients = [] - # This is an lvm command that is just taking too long and doesn't + # This is a lvm command that is just taking too long and doesn't # support background operation if self._request: # Faking the percentage when we don't have one @@ -138,7 +138,7 @@ class JobState(object): # If a waiting client timer pops before the job is done we will allow # the client to remove themselves from the list. As we have a lock # here and a lock in the waiting client too, and they can be obtained - # in different orders, a dead lock can occur. + # in different orders, a deadlock can occur. # As this remove is really optional, we will try to acquire the lock # and remove. If we are unsuccessful it's not fatal, we just delay # the time when the objects can be garbage collected by python diff --git a/daemons/lvmdbusd/loader.py b/daemons/lvmdbusd/loader.py index 101502add..548c9dcf4 100644 --- a/daemons/lvmdbusd/loader.py +++ b/daemons/lvmdbusd/loader.py @@ -42,7 +42,7 @@ def common(retrieve, o_type, search_keys, existing_paths = cfg.om.object_paths_by_type(o_type) for o in objects: - # Assume we need to add this one to dbus, unless we are refreshing + # Assume we need to add this one to dbus, unless we are refreshing, # and it's already present return_object = True diff --git a/daemons/lvmdbusd/lv.py b/daemons/lvmdbusd/lv.py index 30c105342..6a4161ad8 100644 --- a/daemons/lvmdbusd/lv.py +++ b/daemons/lvmdbusd/lv.py @@ -25,8 +25,8 @@ from .utils import round_size, mt_remove_dbus_objects, lvm_column_key from .job import JobState -# Try and build a key for a LV, so that we sort the LVs with least dependencies -# first. This may be error prone because of the flexibility LVM +# Try and build a key for a LV, so that we sort the LVs with the least dependencies +# first. This may be error-prone because of the flexibility LVM # provides and what you can stack. def get_key(i): diff --git a/daemons/lvmdbusd/main.py b/daemons/lvmdbusd/main.py index e869bcec3..98b235f4e 100644 --- a/daemons/lvmdbusd/main.py +++ b/daemons/lvmdbusd/main.py @@ -67,7 +67,7 @@ def check_fr_size(value): def install_signal_handlers(): # Because of the glib main loop stuff the python signal handler code is - # apparently not usable and we need to use the glib calls instead + # apparently not usable, and we need to use the glib calls instead signal_add = None if hasattr(GLib, 'unix_signal_add'): @@ -208,7 +208,7 @@ def main(): thread_list.append( threading.Thread(target=process_request, name='process_request')) - # Have a single thread handling updating lvm and the dbus model so we + # Have a single thread handling updating lvm and the dbus model, so we # don't have multiple threads doing this as the same time updater = StateUpdate() thread_list.append(updater.thread) diff --git a/daemons/lvmdbusd/objectmanager.py b/daemons/lvmdbusd/objectmanager.py index f9586ec9a..c5ea14bc3 100644 --- a/daemons/lvmdbusd/objectmanager.py +++ b/daemons/lvmdbusd/objectmanager.py @@ -159,7 +159,7 @@ class ObjectManager(AutomatedProperties): # print('Registering object path %s for %s' % # (path, dbus_object.lvm_id)) - # We want fast access to the object by a number of different ways + # We want fast access to the object by a number of different ways, # so we use multiple hashs with different keys self._lookup_add(dbus_object, path, dbus_object.lvm_id, dbus_object.Uuid) @@ -209,7 +209,7 @@ class ObjectManager(AutomatedProperties): def get_object_by_lvm_id(self, lvm_id): """ - Given an lvm identifier, return the object registered for it + Given a lvm identifier, return the object registered for it :param lvm_id: The lvm identifier """ with self.rlock: @@ -220,7 +220,7 @@ class ObjectManager(AutomatedProperties): def get_object_path_by_lvm_id(self, lvm_id): """ - Given an lvm identifier, return the object path for it + Given a lvm identifier, return the object path for it :param lvm_id: The lvm identifier :return: Object path or '/' if not found """ @@ -295,7 +295,7 @@ class ObjectManager(AutomatedProperties): if uuid == lvm_id: path = self._id_lookup(lvm_id) else: - # We have a uuid and a lvm_id we can do sanity checks to ensure + # We have an uuid and a lvm_id we can do sanity checks to ensure # that they are consistent # If a PV is missing its device path is '[unknown]' or some @@ -305,7 +305,7 @@ class ObjectManager(AutomatedProperties): if cfg.db.pv_missing(uuid): lvm_id = None - # Lets check for the uuid first + # Let's check for the uuid first path = self._id_lookup(uuid) if path: # Ensure table lookups are correct diff --git a/daemons/lvmdbusd/request.py b/daemons/lvmdbusd/request.py index 5d4d7e30a..69274b20f 100644 --- a/daemons/lvmdbusd/request.py +++ b/daemons/lvmdbusd/request.py @@ -141,7 +141,7 @@ class RequestEntry(object): mt_async_call(self.cb_error, error_exception) else: - # We have a job and it's complete, indicate that it's done. + # We have a job, and it's complete, indicate that it's done. self._job.Complete = True self._job = None diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py index 0b81591b2..c11737b82 100644 --- a/daemons/lvmdbusd/utils.py +++ b/daemons/lvmdbusd/utils.py @@ -90,7 +90,7 @@ def init_class_from_arguments( nt = k # If the current attribute has a value, but the incoming does - # not, don't overwrite it. Otherwise the default values on the + # not, don't overwrite it. Otherwise, the default values on the # property decorator don't work as expected. cur = getattr(obj_instance, nt, v) @@ -110,7 +110,7 @@ def init_class_from_arguments( def get_properties(f): """ - Walks through an object instance or it's parent class(es) and determines + Walks through an object instance, or it's parent class(es) and determines which attributes are properties and if they were created to be used for dbus. :param f: Object to inspect @@ -194,7 +194,7 @@ def add_properties(xml, interface, props): interface_element = c break - # Interface is not present, lets create it so we have something to + # Interface is not present, lets create it, so we have something to # attach the properties too if interface_element is None: interface_element = Et.Element("interface", name=interface)

1 year, 2 months

1
0
0 / 0

main - configure: update

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a861f0425e0688b2feb... Commit: a861f0425e0688b2feb97b15277bceb3132d5004 Parent: 13b216fbdf038dc83d31c43026aa53d281ab3942 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Feb 16 23:26:24 2023 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Feb 17 00:08:50 2023 +0100 configure: update --- configure | 326 +++++++++++++++++++++++++------------------------------------- 1 file changed, 129 insertions(+), 197 deletions(-) diff --git a/configure b/configure index 3e09aa265..c2eee6ba7 100755 --- a/configure +++ b/configure @@ -686,23 +686,9 @@ SYSCONFDIR SELINUX_PC SELINUX_LIBS SBINDIR -SALCK_LIBS -SALCK_CFLAGS -SACKPT_LIBS -SACKPT_CFLAGS -REPLICATORS RT_LIBS -QUORUM_LIBS -QUORUM_CFLAGS PYTHON3DIR PYTHON2DIR -PYTHON3_LIBDIRS -PYTHON2_LIBDIRS -PYTHON3_INCDIRS -PYTHON2_INCDIRS -PYTHON3_BINDINGS -PYTHON2_BINDINGS -PYTHON_BINDINGS PYTHON3 PYTHON2 PTHREAD_LIBS @@ -728,11 +714,6 @@ LDDEPS JOBS INTL INTEGRITY -HAVE_VALGRIND -HAVE_REALTIME -HAVE_LIBDL -HAVE_BLKID_SUBLKS_FSINFO -HAVE_BLKID BLKDEACTIVATE LVRESIZE_FS_HELPER_PATH FSADM_PATH @@ -741,8 +722,6 @@ ELDFLAGS DM_LIB_PATCHLEVEL DMEVENTD_PATH DL_LIBS -DLM_LIBS -DLM_CFLAGS DEVMAPPER DEFAULT_USE_LVMLOCKD DEFAULT_USE_LVMPOLLD @@ -764,8 +743,6 @@ DEFAULT_ARCHIVE_SUBDIR DEBUG COPTIMISE_FLAG CONFDIR -CONFDB_LIBS -CONFDB_CFLAGS CMDLIB CLDWHOLEARCHIVE CLDNOWHOLEARCHIVE @@ -806,16 +783,16 @@ UDEV_CFLAGS BLKID_LIBS BLKID_CFLAGS SYSTEMD_RUN_CMD -SYSTEMD_LIBS -SYSTEMD_CFLAGS -LOCKD_IDM_LIBS -LOCKD_IDM_CFLAGS -LOCKD_DLM_CONTROL_LIBS -LOCKD_DLM_CONTROL_CFLAGS -LOCKD_DLM_LIBS -LOCKD_DLM_CFLAGS -LOCKD_SANLOCK_LIBS -LOCKD_SANLOCK_CFLAGS +LIBSYSTEMD_LIBS +LIBSYSTEMD_CFLAGS +LIBSEAGATEILM_LIBS +LIBSEAGATEILM_CFLAGS +LIBDLMCONTROL_LIBS +LIBDLMCONTROL_CFLAGS +LIBDLM_LIBS +LIBDLM_CFLAGS +LIBSANLOCKCLIENT_LIBS +LIBSANLOCKCLIENT_CFLAGS VALGRIND_LIBS VALGRIND_CFLAGS GENPNG @@ -1052,16 +1029,16 @@ CPG_CFLAGS CPG_LIBS VALGRIND_CFLAGS VALGRIND_LIBS -LOCKD_SANLOCK_CFLAGS -LOCKD_SANLOCK_LIBS -LOCKD_DLM_CFLAGS -LOCKD_DLM_LIBS -LOCKD_DLM_CONTROL_CFLAGS -LOCKD_DLM_CONTROL_LIBS -LOCKD_IDM_CFLAGS -LOCKD_IDM_LIBS -SYSTEMD_CFLAGS -SYSTEMD_LIBS +LIBSANLOCKCLIENT_CFLAGS +LIBSANLOCKCLIENT_LIBS +LIBDLM_CFLAGS +LIBDLM_LIBS +LIBDLMCONTROL_CFLAGS +LIBDLMCONTROL_LIBS +LIBSEAGATEILM_CFLAGS +LIBSEAGATEILM_LIBS +LIBSYSTEMD_CFLAGS +LIBSYSTEMD_LIBS BLKID_CFLAGS BLKID_LIBS UDEV_CFLAGS @@ -1867,26 +1844,25 @@ Some influential environment variables: C compiler flags for VALGRIND, overriding pkg-config VALGRIND_LIBS linker flags for VALGRIND, overriding pkg-config - LOCKD_SANLOCK_CFLAGS - C compiler flags for LOCKD_SANLOCK, overriding pkg-config - LOCKD_SANLOCK_LIBS - linker flags for LOCKD_SANLOCK, overriding pkg-config - LOCKD_DLM_CFLAGS - C compiler flags for LOCKD_DLM, overriding pkg-config - LOCKD_DLM_LIBS - linker flags for LOCKD_DLM, overriding pkg-config - LOCKD_DLM_CONTROL_CFLAGS - C compiler flags for LOCKD_DLM_CONTROL, overriding pkg-config - LOCKD_DLM_CONTROL_LIBS - linker flags for LOCKD_DLM_CONTROL, overriding pkg-config - LOCKD_IDM_CFLAGS - C compiler flags for LOCKD_IDM, overriding pkg-config - LOCKD_IDM_LIBS - linker flags for LOCKD_IDM, overriding pkg-config - SYSTEMD_CFLAGS - C compiler flags for SYSTEMD, overriding pkg-config - SYSTEMD_LIBS - linker flags for SYSTEMD, overriding pkg-config + LIBSANLOCKCLIENT_CFLAGS + C compiler flags for LIBSANLOCKCLIENT, overriding pkg-config + LIBSANLOCKCLIENT_LIBS + linker flags for LIBSANLOCKCLIENT, overriding pkg-config + LIBDLM_CFLAGS + C compiler flags for LIBDLM, overriding pkg-config + LIBDLM_LIBS linker flags for LIBDLM, overriding pkg-config + LIBDLMCONTROL_CFLAGS + C compiler flags for LIBDLMCONTROL, overriding pkg-config + LIBDLMCONTROL_LIBS + linker flags for LIBDLMCONTROL, overriding pkg-config + LIBSEAGATEILM_CFLAGS + C compiler flags for LIBSEAGATEILM, overriding pkg-config + LIBSEAGATEILM_LIBS + linker flags for LIBSEAGATEILM, overriding pkg-config + LIBSYSTEMD_CFLAGS + C compiler flags for LIBSYSTEMD, overriding pkg-config + LIBSYSTEMD_LIBS + linker flags for LIBSYSTEMD, overriding pkg-config BLKID_CFLAGS C compiler flags for BLKID, overriding pkg-config BLKID_LIBS linker flags for BLKID, overriding pkg-config @@ -12064,11 +12040,11 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_SANLOCK" >&5 -printf %s "checking for LOCKD_SANLOCK... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSANLOCKCLIENT" >&5 +printf %s "checking for LIBSANLOCKCLIENT... " >&6; } -if test -n "$LOCKD_SANLOCK_CFLAGS"; then - pkg_cv_LOCKD_SANLOCK_CFLAGS="$LOCKD_SANLOCK_CFLAGS" +if test -n "$LIBSANLOCKCLIENT_CFLAGS"; then + pkg_cv_LIBSANLOCKCLIENT_CFLAGS="$LIBSANLOCKCLIENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsanlock_client >= 3.3.0\""; } >&5 @@ -12076,7 +12052,7 @@ if test -n "$LOCKD_SANLOCK_CFLAGS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_SANLOCK_CFLAGS=`$PKG_CONFIG --cflags "libsanlock_client >= 3.3.0" 2>/dev/null` + pkg_cv_LIBSANLOCKCLIENT_CFLAGS=`$PKG_CONFIG --cflags "libsanlock_client >= 3.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12084,8 +12060,8 @@ fi else pkg_failed=untried fi -if test -n "$LOCKD_SANLOCK_LIBS"; then - pkg_cv_LOCKD_SANLOCK_LIBS="$LOCKD_SANLOCK_LIBS" +if test -n "$LIBSANLOCKCLIENT_LIBS"; then + pkg_cv_LIBSANLOCKCLIENT_LIBS="$LIBSANLOCKCLIENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsanlock_client >= 3.3.0\""; } >&5 @@ -12093,7 +12069,7 @@ if test -n "$LOCKD_SANLOCK_LIBS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_SANLOCK_LIBS=`$PKG_CONFIG --libs "libsanlock_client >= 3.3.0" 2>/dev/null` + pkg_cv_LIBSANLOCKCLIENT_LIBS=`$PKG_CONFIG --libs "libsanlock_client >= 3.3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12114,12 +12090,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LOCKD_SANLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1` + LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1` else - LOCKD_SANLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1` + LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LOCKD_SANLOCK_PKG_ERRORS" >&5 + echo "$LIBSANLOCKCLIENT_PKG_ERRORS" >&5 $bailout elif test $pkg_failed = untried; then @@ -12127,16 +12103,15 @@ elif test $pkg_failed = untried; then printf "%s\n" "no" >&6; } $bailout else - LOCKD_SANLOCK_CFLAGS=$pkg_cv_LOCKD_SANLOCK_CFLAGS - LOCKD_SANLOCK_LIBS=$pkg_cv_LOCKD_SANLOCK_LIBS + LIBSANLOCKCLIENT_CFLAGS=$pkg_cv_LIBSANLOCKCLIENT_CFLAGS + LIBSANLOCKCLIENT_LIBS=$pkg_cv_LIBSANLOCKCLIENT_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - HAVE_LOCKD_SANLOCK="yes" + BUILD_LVMLOCKD="yes" fi printf "%s\n" "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h - BUILD_LVMLOCKD=yes fi @@ -12159,11 +12134,11 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_DLM" >&5 -printf %s "checking for LOCKD_DLM... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLM" >&5 +printf %s "checking for LIBDLM... " >&6; } -if test -n "$LOCKD_DLM_CFLAGS"; then - pkg_cv_LOCKD_DLM_CFLAGS="$LOCKD_DLM_CFLAGS" +if test -n "$LIBDLM_CFLAGS"; then + pkg_cv_LIBDLM_CFLAGS="$LIBDLM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5 @@ -12171,7 +12146,7 @@ if test -n "$LOCKD_DLM_CFLAGS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_DLM_CFLAGS=`$PKG_CONFIG --cflags "libdlm" 2>/dev/null` + pkg_cv_LIBDLM_CFLAGS=`$PKG_CONFIG --cflags "libdlm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12179,8 +12154,8 @@ fi else pkg_failed=untried fi -if test -n "$LOCKD_DLM_LIBS"; then - pkg_cv_LOCKD_DLM_LIBS="$LOCKD_DLM_LIBS" +if test -n "$LIBDLM_LIBS"; then + pkg_cv_LIBDLM_LIBS="$LIBDLM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5 @@ -12188,7 +12163,7 @@ if test -n "$LOCKD_DLM_LIBS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_DLM_LIBS=`$PKG_CONFIG --libs "libdlm" 2>/dev/null` + pkg_cv_LIBDLM_LIBS=`$PKG_CONFIG --libs "libdlm" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12209,12 +12184,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LOCKD_DLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm" 2>&1` + LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm" 2>&1` else - LOCKD_DLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm" 2>&1` + LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LOCKD_DLM_PKG_ERRORS" >&5 + echo "$LIBDLM_PKG_ERRORS" >&5 $bailout elif test $pkg_failed = untried; then @@ -12222,16 +12197,15 @@ elif test $pkg_failed = untried; then printf "%s\n" "no" >&6; } $bailout else - LOCKD_DLM_CFLAGS=$pkg_cv_LOCKD_DLM_CFLAGS - LOCKD_DLM_LIBS=$pkg_cv_LOCKD_DLM_LIBS + LIBDLM_CFLAGS=$pkg_cv_LIBDLM_CFLAGS + LIBDLM_LIBS=$pkg_cv_LIBDLM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - HAVE_LOCKD_DLM="yes" + BUILD_LVMLOCKD="yes" fi printf "%s\n" "#define LOCKDDLM_SUPPORT 1" >>confdefs.h - BUILD_LVMLOCKD=yes fi @@ -12254,11 +12228,11 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_DLM_CONTROL" >&5 -printf %s "checking for LOCKD_DLM_CONTROL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLMCONTROL" >&5 +printf %s "checking for LIBDLMCONTROL... " >&6; } -if test -n "$LOCKD_DLM_CONTROL_CFLAGS"; then - pkg_cv_LOCKD_DLM_CONTROL_CFLAGS="$LOCKD_DLM_CONTROL_CFLAGS" +if test -n "$LIBDLMCONTROL_CFLAGS"; then + pkg_cv_LIBDLMCONTROL_CFLAGS="$LIBDLMCONTROL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlmcontrol >= 3.2\""; } >&5 @@ -12266,7 +12240,7 @@ if test -n "$LOCKD_DLM_CONTROL_CFLAGS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_DLM_CONTROL_CFLAGS=`$PKG_CONFIG --cflags "libdlmcontrol >= 3.2" 2>/dev/null` + pkg_cv_LIBDLMCONTROL_CFLAGS=`$PKG_CONFIG --cflags "libdlmcontrol >= 3.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12274,8 +12248,8 @@ fi else pkg_failed=untried fi -if test -n "$LOCKD_DLM_CONTROL_LIBS"; then - pkg_cv_LOCKD_DLM_CONTROL_LIBS="$LOCKD_DLM_CONTROL_LIBS" +if test -n "$LIBDLMCONTROL_LIBS"; then + pkg_cv_LIBDLMCONTROL_LIBS="$LIBDLMCONTROL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlmcontrol >= 3.2\""; } >&5 @@ -12283,7 +12257,7 @@ if test -n "$LOCKD_DLM_CONTROL_LIBS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_DLM_CONTROL_LIBS=`$PKG_CONFIG --libs "libdlmcontrol >= 3.2" 2>/dev/null` + pkg_cv_LIBDLMCONTROL_LIBS=`$PKG_CONFIG --libs "libdlmcontrol >= 3.2" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12304,12 +12278,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LOCKD_DLM_CONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1` + LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1` else - LOCKD_DLM_CONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1` + LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LOCKD_DLM_CONTROL_PKG_ERRORS" >&5 + echo "$LIBDLMCONTROL_PKG_ERRORS" >&5 $bailout elif test $pkg_failed = untried; then @@ -12317,16 +12291,15 @@ elif test $pkg_failed = untried; then printf "%s\n" "no" >&6; } $bailout else - LOCKD_DLM_CONTROL_CFLAGS=$pkg_cv_LOCKD_DLM_CONTROL_CFLAGS - LOCKD_DLM_CONTROL_LIBS=$pkg_cv_LOCKD_DLM_CONTROL_LIBS + LIBDLMCONTROL_CFLAGS=$pkg_cv_LIBDLMCONTROL_CFLAGS + LIBDLMCONTROL_LIBS=$pkg_cv_LIBDLMCONTROL_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - HAVE_LOCKD_DLM_CONTROL=yes + BUILD_LVMLOCKD="yes" fi printf "%s\n" "#define LOCKDDLM_CONTROL_SUPPORT 1" >>confdefs.h - BUILD_LVMLOCKD=yes fi @@ -12347,13 +12320,20 @@ printf "%s\n" "$BUILD_LOCKDIDM" >&6; } if test "$BUILD_LOCKDIDM" = "yes" then : + if test -n "$PKG_CONFIG" && \ + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5 + ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_IDM" >&5 -printf %s "checking for LOCKD_IDM... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSEAGATEILM" >&5 +printf %s "checking for LIBSEAGATEILM... " >&6; } -if test -n "$LOCKD_IDM_CFLAGS"; then - pkg_cv_LOCKD_IDM_CFLAGS="$LOCKD_IDM_CFLAGS" +if test -n "$LIBSEAGATEILM_CFLAGS"; then + pkg_cv_LIBSEAGATEILM_CFLAGS="$LIBSEAGATEILM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseagate_ilm >= 0.1.0\""; } >&5 @@ -12361,7 +12341,7 @@ if test -n "$LOCKD_IDM_CFLAGS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_IDM_CFLAGS=`$PKG_CONFIG --cflags "libseagate_ilm >= 0.1.0" 2>/dev/null` + pkg_cv_LIBSEAGATEILM_CFLAGS=`$PKG_CONFIG --cflags "libseagate_ilm >= 0.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12369,8 +12349,8 @@ fi else pkg_failed=untried fi -if test -n "$LOCKD_IDM_LIBS"; then - pkg_cv_LOCKD_IDM_LIBS="$LOCKD_IDM_LIBS" +if test -n "$LIBSEAGATEILM_LIBS"; then + pkg_cv_LIBSEAGATEILM_LIBS="$LIBSEAGATEILM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseagate_ilm >= 0.1.0\""; } >&5 @@ -12378,7 +12358,7 @@ if test -n "$LOCKD_IDM_LIBS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LOCKD_IDM_LIBS=`$PKG_CONFIG --libs "libseagate_ilm >= 0.1.0" 2>/dev/null` + pkg_cv_LIBSEAGATEILM_LIBS=`$PKG_CONFIG --libs "libseagate_ilm >= 0.1.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12399,12 +12379,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LOCKD_IDM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1` + LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1` else - LOCKD_IDM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1` + LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LOCKD_IDM_PKG_ERRORS" >&5 + echo "$LIBSEAGATEILM_PKG_ERRORS" >&5 $bailout elif test $pkg_failed = untried; then @@ -12412,26 +12392,19 @@ elif test $pkg_failed = untried; then printf "%s\n" "no" >&6; } $bailout else - LOCKD_IDM_CFLAGS=$pkg_cv_LOCKD_IDM_CFLAGS - LOCKD_IDM_LIBS=$pkg_cv_LOCKD_IDM_LIBS + LIBSEAGATEILM_CFLAGS=$pkg_cv_LIBSEAGATEILM_CFLAGS + LIBSEAGATEILM_LIBS=$pkg_cv_LIBSEAGATEILM_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - HAVE_LOCKD_IDM=yes -fi - if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5 - ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - HAVE_LOCKD_IDM="yes" -else - $bailout + BUILD_LVMLOCKD="yes" fi printf "%s\n" "#define LOCKDIDM_SUPPORT 1" >>confdefs.h - BUILD_LVMLOCKD=yes + +else + $bailout +fi fi @@ -12706,19 +12679,19 @@ then : pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -printf %s "checking for SYSTEMD... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5 +printf %s "checking for LIBSYSTEMD... " >&6; } -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" +if test -n "$LIBSYSTEMD_CFLAGS"; then + pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5 - ($PKG_CONFIG --exists --print-errors "systemd") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "systemd" 2>/dev/null` + pkg_cv_LIBSYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12726,16 +12699,16 @@ fi else pkg_failed=untried fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" +if test -n "$LIBSYSTEMD_LIBS"; then + pkg_cv_LIBSYSTEMD_LIBS="$LIBSYSTEMD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5 - ($PKG_CONFIG --exists --print-errors "systemd") 2>&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "systemd" 2>/dev/null` + pkg_cv_LIBSYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12756,12 +12729,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd" 2>&1` + LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd" 2>&1` + LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 + echo "$LIBSYSTEMD_PKG_ERRORS" >&5 $bailout elif test $pkg_failed = untried; then @@ -12769,11 +12742,11 @@ elif test $pkg_failed = untried; then printf "%s\n" "no" >&6; } $bailout else - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS + LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS + LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - SYSTEMD_LIBS="-lsystemd" + fi fi @@ -13387,13 +13360,9 @@ printf "%s\n" "$CMDLIB" >&6; } if test "$CMDLIB" = "yes" then : - - LVM2CMD_LIB="-llvm2cmd" - + LVM2CMD_LIB="-llvm2cmd" else $as_nop - - LVM2CMD_LIB="" - + LVM2CMD_LIB= fi ################################################################################ @@ -13409,7 +13378,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LVMDBUSD" >&5 printf "%s\n" "$BUILD_LVMDBUSD" >&6; } -if test "$NOTIFYDBUS_SUPPORT" = "yes" && test "BUILD_LVMDBUSD" = "yes" +if test "$NOTIFYDBUS_SUPPORT" = "no" && test "$BUILD_LVMDBUSD" = "yes" then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Building D-Bus support without D-Bus notifications." >&5 printf "%s\n" "$as_me: WARNING: Building D-Bus support without D-Bus notifications." >&2;} @@ -13467,7 +13436,7 @@ then : printf %s "(cached) " >&6 else $as_nop - for am_cv_pathless_PYTHON in python3 python2 python python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python3 python2 python python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -13941,14 +13910,10 @@ then : as_fn_error $? "python3 headers are required for --enable-python3_bindings or --enable-dbus-service but cannot be found" "$LINENO" 5 fi - PYTHON3_INCDIRS=`"$PYTHON3_CONFIG" --includes` - PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs` PYTHON3DIR=$pythondir if test "$PYTHON3_BINDINGS" = "yes" then : - - PYTHON_BINDINGS="yes" - + PYTHON_BINDINGS="yes" fi # To get this macro, install autoconf-archive package then run autoreconf @@ -15926,16 +15891,6 @@ printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h - - - - - - - - - - ################################################################################ @@ -16048,29 +16003,6 @@ printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h - - - - - - - - - - - - - - - - - - - - - - -

1 year, 2 months

1
0
0 / 0

main - tests: safety first...

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=13b216fbdf038dc83d3... Commit: 13b216fbdf038dc83d31c43026aa53d281ab3942 Parent: 1788b4b3aa129b9bfbb977be263455680b6dc128 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Feb 16 14:21:17 2023 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Feb 17 00:08:50 2023 +0100 tests: safety first... --- test/shell/lvconvert-raid-reshape.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/shell/lvconvert-raid-reshape.sh b/test/shell/lvconvert-raid-reshape.sh index e55ab7ab9..abea0ff10 100644 --- a/test/shell/lvconvert-raid-reshape.sh +++ b/test/shell/lvconvert-raid-reshape.sh @@ -17,6 +17,10 @@ LVM_SKIP_LARGE_TESTS=0 . lib/inittest +case "$(uname -r)" in +5.19*) skip "Skippen test that kills this kernel" ;; +esac + which mkfs.ext4 || skip aux have_raid 1 14 0 || skip

1 year, 2 months

1
0
0 / 0

main - tests: lvmdbus testing use --debug optinally now

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1788b4b3aa129b9bfbb... Commit: 1788b4b3aa129b9bfbb977be263455680b6dc128 Parent: 06c5c29443fdd48730a282a5db16e46c793db27b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Feb 16 16:50:07 2023 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Feb 17 00:08:50 2023 +0100 tests: lvmdbus testing use --debug optinally now To shorten down logging output of lvmdbus - use for now lvmdbus with --debug option only when LVM_DEBUG_LVMDBUS=1 is set. --- test/Makefile.in | 3 ++- test/lib/aux.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 1cad634b8..1ea797d85 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -111,12 +111,13 @@ help: @echo " LVM_TEST_CACHE_REPAIR_CMD Command for cache_repair [$(LVM_TEST_CACHE_REPAIR_CMD)]." @echo " LVM_TEST_CACHE_RESTORE_CMD Command for cache_restore [$(LVM_TEST_CACHE_RESTORE_CMD)]." @echo " LVM_TEST_UNLIMITED Set to get unlimited test log (>32MB)" - @echo " LVM_TEST_DEVICE_LIST File path listing real devs that tests can use." + @echo " LVM_TEST_DEVICE_LIST File path listing real devs that tests can use." @echo " LVM_VALGRIND Enable valgrind testing, execs $$"VALGRIND. @echo " LVM_VALGRIND_DMEVENTD Enable valgrind testing of dmeventd (1)." @echo " LVM_VALGRIND_LVMPOLLD Enable valgrind testing of lvmpolld (1)." @echo " LVM_STRACE Enable strace logging." @echo " LVM_DEBUG_LEVEL Sets debuging level for valgrind/strace (use > 0)." + @echo " LVM_DEBUG_LVMDBUS Run lvmdbus with --debug option." @echo " LVM_VERIFY_UDEV Default verify state for lvm.conf." @echo " LVM_LOG_FILE_MAX_LINES Maximum number of logged lines for lvm2 command [1000000]." @echo " S Skip given test(s) (regex)." diff --git a/test/lib/aux.sh b/test/lib/aux.sh index ccc787eca..c15fd5baa 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -281,6 +281,7 @@ lvmpolld_dump() { } prepare_lvmdbusd() { + local lvmdbusdebug= local daemon rm -f debug.log_LVMDBUSD_out @@ -324,7 +325,8 @@ prepare_lvmdbusd() { echo "## preparing lvmdbusd..." lvmconf "global/notify_dbus = 1" - "$daemon" --debug > debug.log_LVMDBUSD_out 2>&1 & + test "${LVM_DEBUG_LVMDBUS:-0}" != "0" && lvmdbusdebug="--debug" + "$daemon" $lvmdbusdebug > debug.log_LVMDBUSD_out 2>&1 & local pid=$! sleep 1

1 year, 2 months

1
0
0 / 0

main - tests: check failing vdo conversion

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=06c5c29443fdd48730a... Commit: 06c5c29443fdd48730a282a5db16e46c793db27b Parent: d58b475f6320257e72f01be3c57badd65af28d56 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Feb 17 00:06:56 2023 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Feb 17 00:08:50 2023 +0100 tests: check failing vdo conversion When we detect not usable vdo on a machine, check lvconvert fails. --- test/shell/lvconvert-vdo.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/shell/lvconvert-vdo.sh b/test/shell/lvconvert-vdo.sh index c42d8f25a..7c0bce56b 100644 --- a/test/shell/lvconvert-vdo.sh +++ b/test/shell/lvconvert-vdo.sh @@ -18,12 +18,18 @@ SKIP_WITH_LVMPOLLD=1 # # Main # -aux have_vdo 6 2 0 || skip - aux prepare_vg 2 6400 # Conversion to vdo-pool lvcreate -L5G -n $lv1 $vg + +if not aux have_vdo 6 2 0 ; then +# For unsupported VDO let's check lvconvert fails + not lvconvert --yes --type vdo-pool $vg/$lv1 |& tee out + vgremove -ff $vg + exit +fi + # Check there is big prompting warning not lvconvert --type vdo-pool $vg/$lv1 |& tee out grep "WARNING" out

1 year, 2 months

1
0
0 / 0

main - makefiles: move include earlier

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d58b475f6320257e72f... Commit: d58b475f6320257e72f01be3c57badd65af28d56 Parent: b9697acbd6b4283b430b5c6a9ced45676c54bc1d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Feb 16 23:40:25 2023 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Feb 17 00:00:12 2023 +0100 makefiles: move include earlier --- daemons/lvmlockd/Makefile.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/daemons/lvmlockd/Makefile.in b/daemons/lvmlockd/Makefile.in index aff4c0123..24191c439 100644 --- a/daemons/lvmlockd/Makefile.in +++ b/daemons/lvmlockd/Makefile.in @@ -16,6 +16,11 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ SOURCES = lvmlockd-core.c +SOURCES2 = lvmlockctl.c + +TARGETS = lvmlockd lvmlockctl + +include $(top_builddir)/make.tmpl ifeq ("@BUILD_LOCKDSANLOCK@", "yes") SOURCES += lvmlockd-sanlock.c @@ -36,17 +41,11 @@ ifeq ("@BUILD_LOCKDIDM@", "yes") LOCK_LIBS += -lseagate_ilm $(BLKID_LIBS) endif -SOURCES2 = lvmlockctl.c - -TARGETS = lvmlockd lvmlockctl - CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) CFLOW_TARGET = lvmlockd .PHONY: install_lvmlockd install_lvmlockctl -include $(top_builddir)/make.tmpl - CFLAGS += $(EXTRA_EXEC_CFLAGS) INCLUDES += -I$(top_srcdir)/libdaemon/server LDFLAGS += -L$(top_builddir)/libdaemon/server $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS)

1 year, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits February 2023