lvm2-commits November 2016

lvm2-commits@lists.fedorahosted.org

7 participants
113 discussions

master - dmsetup: return 0 for [--]{version,help}
by Heinz Mauelshagen 10 Nov '16

10 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0b1c796420610f01… Commit: 0b1c796420610f015f65530ab68ade6d8119487d Parent: c1862ea84cdcbb72f4c30a81a7643f39f851e96d Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Thu Nov 10 17:03:04 2016 +0100 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Thu Nov 10 17:03:04 2016 +0100 dmsetup: return 0 for [--]{version,help} dmsetup regressed returning 1 when properly processing version or help subcommands. Resolves: rhbz1393692 --- tools/dmsetup.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 4b525e2..371c0f8 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -6852,6 +6852,7 @@ doit: } } while (--_count); + ret = 0; out: if (_report) dm_report_free(_report);

1 0

master - tests: for repair we need neewer version
by Zdenek Kabelac 08 Nov '16

08 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c1862ea84cdcbb72… Commit: c1862ea84cdcbb72f4c30a81a7643f39f851e96d Parent: 2ec3e7dca8822770b3eb832488b9897b7d372e01 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 8 11:15:25 2016 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 8 16:01:35 2016 +0100 tests: for repair we need neewer version Older cache targets were not able to report write failures. --- test/shell/lvconvert-repair-cache.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-repair-cache.sh b/test/shell/lvconvert-repair-cache.sh index f907289..565ebf4 100644 --- a/test/shell/lvconvert-repair-cache.sh +++ b/test/shell/lvconvert-repair-cache.sh @@ -25,7 +25,8 @@ which "$FSCK" || skip # # Main # -aux have_cache 1 5 0 || skip +# older versions of cache target reported unreliably write failures +aux have_cache 1 7 0 || skip aux prepare_vg 4

1 0

master - tests: test raid0_meta type
by Zdenek Kabelac 08 Nov '16

08 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2ec3e7dca8822770… Commit: 2ec3e7dca8822770b3eb832488b9897b7d372e01 Parent: ada5733c5652d456ffa138b0d07e6897824813b0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 7 11:05:50 2016 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 8 16:01:35 2016 +0100 tests: test raid0_meta type Enable testing of raid0_meta type. Also slow down devices a bit more. --- test/shell/lvcreate-raid-nosync.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/shell/lvcreate-raid-nosync.sh b/test/shell/lvcreate-raid-nosync.sh index 1343e8f..b1916f5 100644 --- a/test/shell/lvcreate-raid-nosync.sh +++ b/test/shell/lvcreate-raid-nosync.sh @@ -24,12 +24,12 @@ aux prepare_vg 6 # Delay 1st leg so that rebuilding status characters # can be read before resync finished too quick. -aux delay_dev "$dev1" 0 10 $(get first_extent_sector "$dev1") +aux delay_dev "$dev1" 0 50 $(get first_extent_sector "$dev1") # raid0/raid0_meta don't support resynchronization for r in raid0 raid0_meta do - lvcreate --yes --type raid0 -i 3 -l 1 -n $lv1 $vg + lvcreate --yes --type $r -i 3 -l 1 -n $lv1 $vg check raid_leg_status $vg $lv1 "AAA" lvremove --yes $vg/$lv1 done @@ -47,7 +47,7 @@ check raid_leg_status $vg $lv1 "AAA" lvremove --yes $vg/$lv1 for r in $segtypes -do +do # raid4/5 support resynchronization lvcreate --yes --type $r -i 3 -l 2 -n $lv1 $vg check raid_leg_status $vg $lv1 "aaaa"

1 0

master - raid: faster rmeta clearing
by Zdenek Kabelac 08 Nov '16

08 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ada5733c5652d456… Commit: ada5733c5652d456ffa138b0d07e6897824813b0 Parent: 9e03fc3c2ac682b4edc9a91eea7256e272a5bd71 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 8 11:54:28 2016 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 8 16:00:14 2016 +0100 raid: faster rmeta clearing Instead of clearing multiple rmeta device with sequential activation process and waiting for udev for every _rmeta device separately, activate all _rmeta devices first and then clear them and deactivate afterwards. Also update some tracing messages. When anyhing goes wrong during clearing process, always try to deactivate as much _rmeta devices as possible before fail. --- WHATS_NEW | 1 + lib/metadata/lv_manip.c | 78 ++++++++++++++++++++++++++++------------------ 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 2e95492..17fbdc0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.168 - ==================================== + More efficiently prepare _rmeta devices when creating a new raid LV. Version 2.02.167 - 5th November 2016 ==================================== diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 5adf81e..0643000 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -3844,6 +3844,7 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, uint32_t fa, s; int clear_metadata = 0; uint32_t area_multiple = 1; + int fail; if (!(segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_STRIPED))) return_0; @@ -3917,45 +3918,60 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, if (!vg_write(lv->vg) || !vg_commit(lv->vg)) return_0; - for (s = 0; s < seg->area_count; s++) { - meta_lv = seg_metalv(seg, s); - - if (test_mode()) { - lv_set_hidden(meta_lv); - continue; + if (test_mode()) + log_verbose("Test mode: Skipping wiping of metadata areas."); + else { + fail = 0; + /* Activate all rmeta devices locally first (more efficient) */ + for (s = 0; !fail && s < seg->area_count; s++) { + meta_lv = seg_metalv(seg, s); + + if (!activate_lv_local(meta_lv->vg->cmd, meta_lv)) { + log_error("Failed to activate %s for clearing.", + display_lvname(meta_lv)); + fail = 1; + } } - /* For clearing, simply activate locally */ - if (!activate_lv_local(meta_lv->vg->cmd, meta_lv)) { - log_error("Failed to activate %s/%s for clearing", - meta_lv->vg->name, meta_lv->name); - return 0; - } + /* Clear all rmeta devices */ + for (s = 0; !fail && s < seg->area_count; s++) { + meta_lv = seg_metalv(seg, s); - log_verbose("Clearing metadata area of %s", - display_lvname(meta_lv)); - /* - * Rather than wiping meta_lv->size, we can simply - * wipe '1' to remove the superblock of any previous - * RAID devices. It is much quicker. - */ - if (!wipe_lv(meta_lv, (struct wipe_params) - { .do_zero = 1, .zero_sectors = 1 })) { - log_error("Failed to zero %s/%s", - meta_lv->vg->name, meta_lv->name); - return 0; + log_verbose("Clearing metadata area of %s.", + display_lvname(meta_lv)); + /* + * Rather than wiping meta_lv->size, we can simply + * wipe '1' to remove the superblock of any previous + * RAID devices. It is much quicker. + */ + if (!wipe_lv(meta_lv, (struct wipe_params) + { .do_zero = 1, .zero_sectors = 1 })) { + stack; + fail = 1; + } } - if (!deactivate_lv(meta_lv->vg->cmd, meta_lv)) { - log_error("Failed to deactivate %s/%s", - meta_lv->vg->name, meta_lv->name); - return 0; + /* Deactivate all rmeta devices */ + for (s = 0; s < seg->area_count; s++) { + meta_lv = seg_metalv(seg, s); + + if (!deactivate_lv(meta_lv->vg->cmd, meta_lv)) { + log_error("Failed to deactivate %s after clearing.", + display_lvname(meta_lv)); + fail = 1; + } + + /* Wipe any temporary tags required for activation. */ + str_list_wipe(&meta_lv->tags); } - lv_set_hidden(meta_lv); - /* Wipe any temporary tags required for activation. */ - str_list_wipe(&meta_lv->tags); + if (fail) + /* Fail, after trying to deactivate all we could */ + return_0; } + + for (s = 0; s < seg->area_count; s++) + lv_set_hidden(seg_metalv(seg, s)); } seg->area_len += extents / area_multiple;

1 0

v2_02_167 annotated tag has been created
by Alasdair Kergon 05 Nov '16

05 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=18d101d178dc8b9d… Commit: 18d101d178dc8b9d3f19b1ddb1b5ab5ee95f63e4 Parent: 0000000000000000000000000000000000000000 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: 2016-11-05 01:03 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: 2016-11-05 01:03 +0000 annotated tag: v2_02_167 has been created at 18d101d178dc8b9d3f19b1ddb1b5ab5ee95f63e4 (tag) tagging eed708dbd985f06ff73494cf688ab7ee54e2d1e7 (commit) replaces v2_02_166 Release 2.02.167 Final bug fix release before more enhancements and refactoring. 67 files changed, 1659 insertions(+), 766 deletions(-) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iEYEABECAAYFAlgdMEYACgkQIoGRwVZ+LBd52wCdGW+8BBY0yk6xp2OnkZUyAMY8 K/EAn1qQ08ycECL49wTojax6cxYzRQWV =AS29 -----END PGP SIGNATURE----- Alasdair G Kergon (6): post-release lvconvert: Disable thin pool raid conversion while active. Revert "cleanup: simplier assign of cmd vars" dmsetup: Produce partial output if dev disappears. tests: Disable 3-leg raid1 pre-sync repair attempt pre-release Bryn M. Reeves (5): libdm: fix stats walk compatibility with older dmsetup libdm: fix dm_stats_delete_region() backwards compat libdm: convert FIEMAP buffer allocation from stack to dm_zalloc dmsetup: obey --programid when deleting regions dmsetup: remove stray ' ' in delete log message David Teigland (4): lvmlockd: fix segfault in error path toollib: clean up coverity issue pvscan: fix autoactivation of exported VG tests: check that pvscan cannot activate exported VG Heinz Mauelshagen (11): lvconvert: certain repair of cache raid volumes fails "Cannot convert internal LV" lvconvert: fix RAID SubLV --splitmirror regression lvconvert: position dedicated parity device in raid4 conversions porperly raid_manip: fix typo lvconvert: revert to only letting raid4 through to lv_raid_convert() lvchange/vgchange/lvconvert: prevent raid4 creation/activation/conversion on non-supporting raid targets lvconvert-raid-takeover.sh: fix test lvconvert: check for supported raid0/raid4 segtypes lvconvert: prevent non-synced raid1 primary leg repair lvconvert: fix raid repair regression test: add raid4 checks to respective tests Peter Rajnoha (3): systemd: disable service start rate limiting for lvm2-pvscan@.service spec: move dmeventd -R from post to posttrans script for device-mapper-event package blkdeactivate: deactivate dev stack if dev on top already unmounted Tony Asleson (30): lvmdbustest.py: Make env variable work lvmdbusd: Clean up objectmanager.get_object_path_by_uuid_lvm_id lvmdbusd: Allow PV device names to be '[unknown]' lvmdbustest.py: Make sure to test for hidden lookups lvmdbusd: Add diagnostic validate for look ups lvmdbusd: Remove extraneous parameter lvmdbusd: Use 'pv_missing' column instead of '[unknown]' lvmdbusd: Add properties to LvCommon lvmdbusd: Add LvCommon.MovePv lvmdbusd: Add LvCommon.DataPercent lvmdbusd: Ensure lvm shell still exists lvmdbusd: Ensure tmp dir gets cleaned up lvmdbustest.py: Ensure we exit non-zero on fail lvmdbustest.py: Print to stderr lvmdbustest.py: Denote failure if set_execution fails lvmdbustest.py: Skip test_job_handling_timer on loopback lvmdbustest.py: Add profile and path for lvm binary lvmdbusd: Disable lvm abort on too much log output lvmdbusd: Remove log ouput when ec=0 & stderr != 0 bytes lvmdbustest.py: Use more compatible syntax lvmdbustest.py: Add $PREFIX support lvmdbustest.py: ws fixes lvmdbusd: Use timer instead of thread lvmdbusd: Return results in main thread lvmdbusd: Execute load in main thread lvmdbusd: Don't use dbus lib in worker thread lvmdbusd: main.py: change debug msg text lvmdbusd: Stop using threads for job wait lvmdbusd: Take out background thread lvmdbusd: Remove the periodic timer task Zdenek Kabelac (30): raid: dmeventd plugin use 64bit arithmetic libdm: check for mem when _canonicalize_field_ids dmeventd: pthread_sigmask in single function cleanup: simplier assign of cmd vars cleanup: drop assign before use cleanup: drop test for NULL cleanup :drop unneeded header file tests: proper wait usage lvconvert: fix error value lvconvert: use _read_conversion_type cleanup: reorder code cleanup: use already set values cleanup: lvconvert drop unused variable cleanup: indent tests: notify dbus only for dbus test lvconvert: still use strcmp for now logging: add more log macros libdm: report logging with errno as changed default dmeventd: abort on internal error dmeventd: debug only subsystemd with # sign dmeventd: separate dm and dmeventd logging cleanup: drop unused attribute cleanup: add 'static' for local struct libdm: use dm_log_with_errno always cleanup: log_info to log_error log_info to log_warn log_info to log_very_verbose cleanup: remove goto cleanup: use WARNING prefix for log_warn dmeventd: provide message context

1 0

master - post-release
by Alasdair Kergon 05 Nov '16

05 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9e03fc3c2ac682b4… Commit: 9e03fc3c2ac682b4edc9a91eea7256e272a5bd71 Parent: eed708dbd985f06ff73494cf688ab7ee54e2d1e7 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Sat Nov 5 01:14:06 2016 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Sat Nov 5 01:14:06 2016 +0000 post-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 3 +++ WHATS_NEW_DM | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index aceedeb..e4ee244 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.167(2)-git (2016-11-05) +2.02.168(2)-git (2016-11-05) diff --git a/VERSION_DM b/VERSION_DM index efc7dd5..e8c90bb 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.136-git (2016-11-05) +1.02.137-git (2016-11-05) diff --git a/WHATS_NEW b/WHATS_NEW index 379bd3b..2e95492 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,3 +1,6 @@ +Version 2.02.168 - +==================================== + Version 2.02.167 - 5th November 2016 ==================================== Use log_error in regex and sysfs filter to describe reason of failure. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index bf16842..72a62cc 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,6 @@ +Version 1.02.137 - +==================================== + Version 1.02.136 - 5th November 2016 ==================================== Log failure of raid device with log_error level.

1 0

master - pre-release
by Alasdair Kergon 05 Nov '16

05 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=eed708dbd985f06f… Commit: eed708dbd985f06ff73494cf688ab7ee54e2d1e7 Parent: 6dce0e948935678e647dddeeea816cb4937f078a Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Sat Nov 5 01:03:32 2016 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Sat Nov 5 01:03:32 2016 +0000 pre-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 4 ++-- WHATS_NEW_DM | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index b2fc25f..aceedeb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.167(2)-git (2016-09-26) +2.02.167(2)-git (2016-11-05) diff --git a/VERSION_DM b/VERSION_DM index 087153f..efc7dd5 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.136-git (2016-09-26) +1.02.136-git (2016-11-05) diff --git a/WHATS_NEW b/WHATS_NEW index a5e6d45..379bd3b 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,5 @@ -Version 2.02.167 - -====================================== +Version 2.02.167 - 5th November 2016 +==================================== Use log_error in regex and sysfs filter to describe reason of failure. Fix blkdeactivate to deactivate dev stack if dev on top already unmounted. Prevent non-synced raid1 repair unless --force diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 17c370c..bf16842 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,8 +1,8 @@ -Version 1.02.136 - -====================================== +Version 1.02.136 - 5th November 2016 +==================================== Log failure of raid device with log_error level. Use dm_log_with_errno and translate runtime to dm_log only when needed. - Make log messages from dm and lvm library differnt from dmeventd. + Make log messages from dm and lvm library different from dmeventd. Notice and Info messages are again logged from dmeventd and its plugins. Dmeventd now also respects DM_ABORT_ON_INTERNAL_ERRORS as libdm based tool. Report as non default dm logging also when logging with errno was changed.

1 0

master - tests: Disable 3-leg raid1 pre-sync repair attempt
by Alasdair Kergon 04 Nov '16

04 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6dce0e948935678e… Commit: 6dce0e948935678e647dddeeea816cb4937f078a Parent: 461d340bd75556ef1f9fcda7ec29ebd5f044d861 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Nov 4 00:23:08 2016 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Nov 4 00:23:08 2016 +0000 tests: Disable 3-leg raid1 pre-sync repair attempt Test fails as it doesn't ensure device isn't already in sync. --- test/shell/lvconvert-repair-raid.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh index b51d8fe..d3ac1da 100644 --- a/test/shell/lvconvert-repair-raid.sh +++ b/test/shell/lvconvert-repair-raid.sh @@ -53,7 +53,8 @@ delay 50 # RAID1 triple-leg single replace during initial sync lvcreate --type raid1 -m 2 -L $RAID_SIZE -n $lv1 $vg "$dev1" "$dev2" "$dev3" aux disable_dev "$dev2" "$dev3" -not lvconvert -y --repair $vg/$lv1 +# FIXME 2016/11/04 AGK: Disabled next line as it fails to guarantee it is not already in sync. +#not lvconvert -y --repair $vg/$lv1 aux wait_for_sync $vg $lv1 lvconvert -y --repair $vg/$lv1 vgreduce --removemissing $vg

1 0

master - lvmdbusd: Remove the periodic timer task
by tasleson 03 Nov '16

03 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=461d340bd75556ef… Commit: 461d340bd75556ef1f9fcda7ec29ebd5f044d861 Parent: ee0c9e7b2306cada41defedd0e5006b0ee2f3a21 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Nov 3 18:27:22 2016 -0500 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Thu Nov 3 18:38:10 2016 -0500 lvmdbusd: Remove the periodic timer task This code is no longer needed because the back ground task has been removed. Will add back if we change the design and end up utilizing multiple worker threads. --- daemons/lvmdbusd/background.py | 18 ------------------ daemons/lvmdbusd/main.py | 8 +++----- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/daemons/lvmdbusd/background.py b/daemons/lvmdbusd/background.py index fc92b0c..f4cb539 100644 --- a/daemons/lvmdbusd/background.py +++ b/daemons/lvmdbusd/background.py @@ -7,7 +7,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import threading import subprocess from . import cfg from .cmdhandler import options_to_cli_args @@ -15,9 +14,6 @@ import dbus from .utils import pv_range_append, pv_dest_ranges, log_error, log_debug import os -_rlock = threading.RLock() -_thread_list = list() - def pv_move_lv_cmd(move_options, lv_full_name, pv_source, pv_source_range, pv_dest_range_list): @@ -130,17 +126,3 @@ def merge(interface_name, lv_uuid, lv_name, merge_options, job_state): raise dbus.exceptions.DBusException( interface_name, 'LV with uuid %s and name %s not present!' % (lv_uuid, lv_name)) - - -def background_reaper(): - with _rlock: - num_threads = len(_thread_list) - 1 - if num_threads >= 0: - for i in range(num_threads, -1, -1): - _thread_list[i].join(0) - if not _thread_list[i].is_alive(): - log_debug("Reaping thread: %s" % _thread_list[i].name) - _thread_list.pop(i) - return True - - diff --git a/daemons/lvmdbusd/main.py b/daemons/lvmdbusd/main.py index 5fe1018..7d10bc3 100644 --- a/daemons/lvmdbusd/main.py +++ b/daemons/lvmdbusd/main.py @@ -22,7 +22,6 @@ from . import lvmdb from gi.repository import GLib from .fetch import load from .manager import Manager -from .background import background_reaper import traceback import queue from . import udevwatch @@ -64,6 +63,7 @@ def _discard_pending_refreshes(): def process_request(): while cfg.run.value != 0: + # noinspection PyBroadException try: req = cfg.worker_q.get(True, 5) @@ -156,10 +156,8 @@ def main(): cfg.db = lvmdb.DataStore(cfg.args.use_json) - # Periodically call function to reap threads that are created - GLib.timeout_add(5000, background_reaper) - - # Using a thread to process requests. + # Using a thread to process requests, we cannot hang the dbus library + # thread that is handling the dbus interface thread_list.append(threading.Thread(target=process_request)) cfg.load(refresh=False, emit_signal=False, need_main_thread=False)

1 0

master - lvmdbusd: Take out background thread
by tasleson 03 Nov '16

03 Nov '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ee0c9e7b2306cada… Commit: ee0c9e7b2306cada41defedd0e5006b0ee2f3a21 Parent: a9ee86ccf2425cbe3f038039c8038db1e1784086 Author: Tony Asleson <tasleson(a)redhat.com> AuthorDate: Thu Nov 3 18:25:12 2016 -0500 Committer: Tony Asleson <tasleson(a)redhat.com> CommitterDate: Thu Nov 3 18:29:06 2016 -0500 lvmdbusd: Take out background thread There is no reason to create another background task when the task that created it is going to block waiting for it to finish. Instead we will just execute the logic in the worker thread that is servicing the worker queue. --- daemons/lvmdbusd/background.py | 103 ++++++++++++--------------------------- daemons/lvmdbusd/job.py | 29 +----------- 2 files changed, 33 insertions(+), 99 deletions(-) diff --git a/daemons/lvmdbusd/background.py b/daemons/lvmdbusd/background.py index 0220b97..fc92b0c 100644 --- a/daemons/lvmdbusd/background.py +++ b/daemons/lvmdbusd/background.py @@ -13,7 +13,6 @@ from . import cfg from .cmdhandler import options_to_cli_args import dbus from .utils import pv_range_append, pv_dest_ranges, log_error, log_debug -import traceback import os _rlock = threading.RLock() @@ -41,15 +40,40 @@ def lv_merge_cmd(merge_options, lv_full_name): return cmd -def _move_merge(interface_name, cmd, job_state): - add(cmd, job_state) - - done = job_state.Wait(-1) - if not done: - ec, err_msg = job_state.GetError +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. + command.insert(0, cfg.LVM_CMD) + process = subprocess.Popen(command, stdout=subprocess.PIPE, + env=os.environ, + stderr=subprocess.PIPE, close_fds=True) + + log_debug("Background process for %s is %d" % + (str(command), process.pid)) + + lines_iterator = iter(process.stdout.readline, b"") + for line in lines_iterator: + line_str = line.decode("utf-8") + + # Check to see if the line has the correct number of separators + try: + if line_str.count(':') == 2: + (device, ignore, percentage) = line_str.split(':') + job_state.Percent = round( + float(percentage.strip()[:-1]), 1) + except ValueError: + log_error("Trying to parse percentage which failed for %s" % + line_str) + + out = process.communicate() + + if process.returncode == 0: + job_state.Percent = 100 + else: raise dbus.exceptions.DBusException( interface_name, - 'Exit code %s, stderr = %s' % (str(ec), err_msg)) + 'Exit code %s, stderr = %s' % (str(process.returncode), out[1])) cfg.load() return '/' @@ -84,8 +108,6 @@ def move(interface_name, lv_name, pv_src_obj, pv_source_range, pv_dests.append((pv_dbus_obj.lvm_id, pr[1], pr[2])) - # Generate the command line for this command, but don't - # execute it. cmd = pv_move_lv_cmd(move_options, lv_name, pv_src.lvm_id, @@ -122,64 +144,3 @@ def background_reaper(): return True -def background_execute(command, background_job): - - # Wrap this whole operation in an exception handler, otherwise if we - # hit a code bug we will silently exit this thread without anyone being - # the wiser. - try: - # We need to execute these command stand alone by forking & exec'ing - # the command always! - command.insert(0, cfg.LVM_CMD) - process = subprocess.Popen(command, stdout=subprocess.PIPE, - env=os.environ, - stderr=subprocess.PIPE, close_fds=True) - - log_debug("Background process for %s is %d" % - (str(command), process.pid)) - - lines_iterator = iter(process.stdout.readline, b"") - for line in lines_iterator: - line_str = line.decode("utf-8") - - # Check to see if the line has the correct number of separators - try: - if line_str.count(':') == 2: - (device, ignore, percentage) = line_str.split(':') - background_job.Percent = round( - float(percentage.strip()[:-1]), 1) - except ValueError: - log_error("Trying to parse percentage which failed for %s" % - line_str) - - out = process.communicate() - - if process.returncode == 0: - background_job.Percent = 100 - else: - log_error("Failed to execute background job %s, STDERR= %s" - % (str(command), out[1])) - - background_job.set_result(process.returncode, out[1]) - log_debug("Background process %d complete!" % process.pid) - - except Exception: - # In the unlikely event that we blow up, we need to unblock caller which - # is waiting on an answer. - st = traceback.format_exc() - error = "Exception in background thread: \n%s" % st - log_error(error) - background_job.set_result(1, error) - - -def add(command, reporting_job): - # Create the thread, get it running and then add it to the list - t = threading.Thread( - target=background_execute, - name="thread: " + ' '.join(command), - args=(command, reporting_job)) - t.start() - - with _rlock: - _thread_list.append(t) - diff --git a/daemons/lvmdbusd/job.py b/daemons/lvmdbusd/job.py index 81048a6..3c3bba0 100644 --- a/daemons/lvmdbusd/job.py +++ b/daemons/lvmdbusd/job.py @@ -66,7 +66,6 @@ class JobState(object): self._percent = 0 self._complete = False self._request = request - self._cond = threading.Condition(self.rlock) self._ec = 0 self._stderr = '' self._waiting_clients = [] @@ -100,7 +99,6 @@ class JobState(object): with self.rlock: self._complete = value self._percent = 100 - self._cond.notify_all() self.notify_waiting_clients() @property @@ -115,29 +113,10 @@ class JobState(object): else: return (-1, 'Job is not complete!') - def set_result(self, ec, msg): - with self.rlock: - self.Complete = True - self._ec = ec - self._stderr = msg - def dtor(self): with self.rlock: self._request = None - def Wait(self, timeout): - try: - with self._cond: - # Check to see if we are done, before we wait - if not self.Complete: - if timeout != -1: - self._cond.wait(timeout) - else: - self._cond.wait() - return self.Complete - except RuntimeError: - return False - @property def Result(self): with self.rlock: @@ -175,6 +154,7 @@ class JobState(object): self._waiting_clients = [] + # noinspection PyPep8Naming class Job(AutomatedProperties): _Percent_meta = ('d', JOB_INTERFACE) @@ -195,10 +175,6 @@ class Job(AutomatedProperties): def Percent(self): return dbus.Double(float(self.state.Percent)) - @Percent.setter - def Percent(self, value): - self.state.Percent = value - @property def Complete(self): return dbus.Boolean(self.state.Complete) @@ -211,9 +187,6 @@ class Job(AutomatedProperties): def GetError(self): return dbus.Struct(self.state.GetError, signature="(is)") - def set_result(self, ec, msg): - self.state.set_result(ec, msg) - @dbus.service.method(dbus_interface=JOB_INTERFACE) def Remove(self): if self.state.Complete:

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2016