April 2016 - lvm2-commits - Fedora mailing-lists

master - nothing
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=94625c405b0c21bc… Commit: 94625c405b0c21bcd015cdc3e07de4a87e712779 Parent: e15b45fe6bdcf0515eadfc1630e4170dd50eb283 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Apr 7 02:15:31 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Apr 7 02:15:31 2016 +0100 nothing --- WHATS_NEW | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index b1da1b0..b9758ac 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,4 +1,4 @@ -Version 2.02.150 - +Version 2.02.150 ================================= Allow the lvmdump directory to exist already provided it is empty.

1 0

master - nothing
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e15b45fe6bdcf051… Commit: e15b45fe6bdcf0515eadfc1630e4170dd50eb283 Parent: 3d76dc30bafefa38f18f451bd38549b9682fb7fc Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Apr 7 02:14:21 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Apr 7 02:14:21 2016 +0100 nothing --- WHATS_NEW | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index c7c00a7..b1da1b0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,4 +1,4 @@ -Version 2.02.150 - +Version 2.02.150 - ================================= Allow the lvmdump directory to exist already provided it is empty.

1 0

master - nothing
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3d76dc30bafefa38… Commit: 3d76dc30bafefa38f18f451bd38549b9682fb7fc Parent: a7d519496616502a82e99b0311b00772449a8ff7 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Apr 7 02:08:00 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Apr 7 02:08:00 2016 +0100 nothing --- WHATS_NEW | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index e66d618..c7c00a7 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,4 +1,4 @@ -Version 2.02.150 - +Version 2.02.150 - ================================= Allow the lvmdump directory to exist already provided it is empty.

1 0

master - nothing
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a7d519496616502a… Commit: a7d519496616502a82e99b0311b00772449a8ff7 Parent: 797b7562fbfa4541f4e12a68649411de76041977 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Apr 7 02:06:21 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Apr 7 02:06:21 2016 +0100 nothing --- WHATS_NEW | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index b1da1b0..e66d618 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,4 +1,4 @@ -Version 2.02.150 - +Version 2.02.150 - ================================= Allow the lvmdump directory to exist already provided it is empty.

1 0

master - nothing
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=797b7562fbfa4541… Commit: 797b7562fbfa4541f4e12a68649411de76041977 Parent: 583c5e16386aaa47f3991f745cdd83a7c4ba5e23 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Apr 7 02:04:04 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Apr 7 02:04:04 2016 +0100 nothing (mailing list testing) --- WHATS_NEW | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index e66d618..b1da1b0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,4 +1,4 @@ -Version 2.02.150 - +Version 2.02.150 - ================================= Allow the lvmdump directory to exist already provided it is empty.

1 0

master - libdm: Correct typo.
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7dcbf1dfd0bc5e2d… Commit: 7dcbf1dfd0bc5e2d057d41900f10016d170bdae2 Parent: f19ec0e36d64bcde6cb4cbd00376fe2377e81b19 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Apr 7 01:51:09 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Apr 7 01:51:09 2016 +0100 libdm: Correct typo. --- libdm/ioctl/libdm-iface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index 8259a78..2733b86 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -1830,7 +1830,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, dmt->read_only ? "readonly " : "", dmt->skip_lockfs ? "skiplockfs " : "", dmt->retry_remove ? "retryremove " : "", - dmt->deferred_remove ? "defferedremove " : "", + dmt->deferred_remove ? "deferredremove " : "", dmt->secure_data ? "securedata " : "", dmt->query_inactive_table ? "inactive " : "", dmt->enable_checks ? "enablechecks " : "",

1 0

master - lvmdump: If dir exists check dir perms too.
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f19ec0e36d64bcde… Commit: f19ec0e36d64bcde6cb4cbd00376fe2377e81b19 Parent: 55001ae9ec2c00a070f8dfa8541f4f17a6e2a284 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Wed Apr 6 22:56:45 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Wed Apr 6 22:56:45 2016 +0100 lvmdump: If dir exists check dir perms too. --- scripts/lvmdump.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/lvmdump.sh b/scripts/lvmdump.sh index 19b36d3..a813537 100755 --- a/scripts/lvmdump.sh +++ b/scripts/lvmdump.sh @@ -100,7 +100,8 @@ else fi if test -d $dir ; then - (shopt -s nullglob dotglob; cd $dir && files=(*) && ((${#files[@]}))) && die 5 "Fatal: directory $dir already exists and is not empty" + (shopt -s nullglob dotglob; test -r $dir -a -w $dir -a -x $dir && cd $dir && files=(*) && ((! ${#files[@]}))) || \ + die 5 "Fatal: directory $dir already exists and is not empty or inaccessible" else test -e $dir && die 3 "Fatal: $dir already exists" $MKDIR -p $dir || die 4 "Fatal: could not create $dir"

1 0

master - lvmdump: Allow dir to exist already if it is empty
by Alasdair Kergon 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=55001ae9ec2c00a0… Commit: 55001ae9ec2c00a070f8dfa8541f4f17a6e2a284 Parent: 307ab2c179073d28d1c9ec9f995f2849aeab07c6 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Wed Apr 6 22:36:42 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Wed Apr 6 22:36:42 2016 +0100 lvmdump: Allow dir to exist already if it is empty --- WHATS_NEW | 1 + scripts/lvmdump.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 98168a1..b1da1b0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.150 - ================================= + Allow the lvmdump directory to exist already provided it is empty. Version 2.02.149 - 1st April 2016 ================================= diff --git a/scripts/lvmdump.sh b/scripts/lvmdump.sh index 1e91a9d..19b36d3 100755 --- a/scripts/lvmdump.sh +++ b/scripts/lvmdump.sh @@ -99,8 +99,12 @@ else dir="$HOME/$dirbase" fi -test -e $dir && die 3 "Fatal: $dir already exists" -$MKDIR -p $dir || die 4 "Fatal: could not create $dir" +if test -d $dir ; then + (shopt -s nullglob dotglob; cd $dir && files=(*) && ((${#files[@]}))) && die 5 "Fatal: directory $dir already exists and is not empty" +else + test -e $dir && die 3 "Fatal: $dir already exists" + $MKDIR -p $dir || die 4 "Fatal: could not create $dir" +fi log="$dir/lvmdump.log"

1 0

master - tests: do not break teardown on failing losetup
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=307ab2c179073d28… Commit: 307ab2c179073d28d1c9ec9f995f2849aeab07c6 Parent: 07c25429e2b1eb08bb208a6bae015870c7ae635a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Apr 1 09:36:23 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:54:37 2016 +0200 tests: do not break teardown on failing losetup Ignore failing 'losetup -d' - i.e. device may have disappeared... --- test/lib/aux.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 9fd1922..c8985ed 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -431,7 +431,7 @@ teardown_devs() { test ${#stray_loops[@]} -eq 0 || { teardown_devs_prefixed "$COMMON_PREFIX" 1 echo "Removing stray loop devices containing $COMMON_PREFIX: ${stray_loops[@]}" - for i in "${stray_loops[@]}" ; do test ! -b $i || losetup -d $i ; done + for i in "${stray_loops[@]}" ; do test ! -b $i || losetup -d $i || true ; done # Leave test when udev processed all removed devices udev_wait }

1 0

master - tests: verify repair of failing mirror
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=07c25429e2b1eb08… Commit: 07c25429e2b1eb08bb208a6bae015870c7ae635a Parent: 9be7bca4be913f3edc4d4f838d72329475fa8655 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 6 11:50:18 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:54:36 2016 +0200 tests: verify repair of failing mirror Improved test script to verify lost mirror image does not cause mirror corruption while mirror is in use. TODO: add more cases (lost mlog...), lost image from 3leg mirror... --- test/shell/lvconvert-repair-mirror.sh | 75 +++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/test/shell/lvconvert-repair-mirror.sh b/test/shell/lvconvert-repair-mirror.sh new file mode 100644 index 0000000..242028d --- /dev/null +++ b/test/shell/lvconvert-repair-mirror.sh @@ -0,0 +1,75 @@ +#!/bin/sh +# Copyright (C) 2016 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +SKIP_WITH_LVMLOCKD=1 +SKIP_WITH_LVMPOLLD=1 + +MOUNT_DIR=mnt + +. lib/inittest + +cleanup_mounted_and_teardown() +{ + umount "$MOUNT_DIR" || true + aux teardown +} + +aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1' + +aux prepare_vg 5 + +################### Check lost mirror leg ################# +# +# NOTE: using --regionsize 1M has major impact on my box +# on read performance while mirror is synchronized +# with the default 512K - my C2D T61 reads just couple MB/s! +# +lvcreate -aey --type mirror -L10 --regionsize 1M -m1 -n $lv1 $vg "$dev1" "$dev2" "$dev3" +mkfs.ext4 "$DM_DEV_DIR/$vg/$lv1" +mkdir "$MOUNT_DIR" + +aux delay_dev "$dev2" 0 500 $(get first_extent_sector "$dev2"): +aux delay_dev "$dev4" 0 500 $(get first_extent_sector "$dev4"): +# +# Enforce syncronization +# ATM requires unmounted/unused LV?? +# +lvchange --yes --resync --noudevsync $vg/$lv1 +trap 'cleanup_mounted_and_teardown' EXIT +mount "$DM_DEV_DIR/$vg/$lv1" "$MOUNT_DIR" + +# run 'dd' operation during failure of 'mlog/mimage' device + +dd if=/dev/zero of=mnt/zero bs=4K count=100 conv=fdatasync 2>err & + +PERCENT=$(get lv_field $vg/$lv1 copy_percent) +PERCENT=${PERCENT%%\.*} # cut decimal +test "$PERCENT" -lt 50 # and check less then 50% mirror is in sync +#lvs -a -o+devices $vg + +#aux disable_dev "$dev3" +aux disable_dev "$dev2" + +lvconvert --yes --repair $vg/$lv1 +lvs -a $vg + +aux enable_dev "$dev2" + +wait +# dd MAY NOT HAVE produced any error message +not grep error err + +lvs -a -o+devices $vg +umount "$MOUNT_DIR" +fsck -n "$DM_DEV_DIR/$vg/$lv1" + +aux enable_dev "$dev4" +lvremove -ff $vg

1 0

master - cleanup: indent
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9be7bca4be913f3e… Commit: 9be7bca4be913f3edc4d4f838d72329475fa8655 Parent: 0584e85736b164d07434619622d6d06ad15fe690 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 6 10:28:02 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:31:02 2016 +0200 cleanup: indent --- lib/activate/activate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 7afb439..985d6b9 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1827,7 +1827,7 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, const struct logical_volume *lv_pre_to_free = NULL; struct logical_volume *lv_pre_tmp; struct seg_list *sl; - struct lv_segment *snap_seg; + struct lv_segment *snap_seg; struct lvinfo info; int r = 0, lockfs = 0, flush_required = 0; struct detached_lv_data detached;

1 0

master - lvconvert: show percent with %.2
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0584e85736b164d0… Commit: 0584e85736b164d07434619622d6d06ad15fe690 Parent: 261a85ced94e2f4ed7c3f01d7d0a7624032e2697 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 5 14:51:05 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:31:02 2016 +0200 lvconvert: show percent with %.2 lvm2 shows percent values with 2 decimal digits elsewhere so use it consistently also for this output. --- tools/lvconvert_poll.c | 4 ++-- tools/polldaemon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/lvconvert_poll.c b/tools/lvconvert_poll.c index 9b758f2..3f3beaf 100644 --- a/tools/lvconvert_poll.c +++ b/tools/lvconvert_poll.c @@ -152,10 +152,10 @@ progress_t poll_merge_progress(struct cmd_context *cmd, } if (parms->progress_display) - log_print_unless_silent("%s: %s: %.1f%%", lv->name, parms->progress_title, + log_print_unless_silent("%s: %s: %.2f%%", lv->name, parms->progress_title, 100.0 - dm_percent_to_float(percent)); else - log_verbose("%s: %s: %.1f%%", lv->name, parms->progress_title, + log_verbose("%s: %s: %.2f%%", lv->name, parms->progress_title, 100.0 - dm_percent_to_float(percent)); if (percent == DM_PERCENT_0) diff --git a/tools/polldaemon.c b/tools/polldaemon.c index 8f1ff90..71d6b3e 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -40,10 +40,10 @@ progress_t poll_mirror_progress(struct cmd_context *cmd, overall_percent = copy_percent(lv); if (parms->progress_display) - log_print_unless_silent("%s: %s: %.1f%%", name, parms->progress_title, + log_print_unless_silent("%s: %s: %.2f%%", name, parms->progress_title, dm_percent_to_float(overall_percent)); else - log_verbose("%s: %s: %.1f%%", name, parms->progress_title, + log_verbose("%s: %s: %.2f%%", name, parms->progress_title, dm_percent_to_float(overall_percent)); if (segment_percent != DM_PERCENT_100)

1 0

master - libdm: improve debug message with ioctl
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=261a85ced94e2f4e… Commit: 261a85ced94e2f4ed7c3f01d7d0a7624032e2697 Parent: 5b2227c2c10c2f762e238fedb756850fe4ac5d5d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 5 14:59:59 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:31:02 2016 +0200 libdm: improve debug message with ioctl Make the debug message a less difficult to read: Ioctl shows [ noopencount flush ] instead of cryptic [NF]. --- libdm/ioctl/libdm-iface.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index 6111cb0..8259a78 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -1814,7 +1814,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, } log_debug_activation("dm %s %s%s %s%s%s %s%.0d%s%.0d%s" - "%s%c%c%s%s%s%s%s%s%s %.0" PRIu64 " %s [%u] (*%u)", + "%s[ %s%s%s%s%s%s%s%s%s] %.0" PRIu64 " %s [%u] (*%u)", _cmd_data_v4[dmt->type].name, dmt->new_uuid ? "UUID " : "", dmi->name, dmi->uuid, dmt->newname ? " " : "", @@ -1825,15 +1825,15 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, dmt->minor > 0 ? dmt->minor : 0, dmt->major > 0 && dmt->minor == 0 ? "0" : "", dmt->major > 0 ? ") " : "", - dmt->no_open_count ? 'N' : 'O', - dmt->no_flush ? 'N' : 'F', - dmt->read_only ? "R" : "", - dmt->skip_lockfs ? "S " : "", - dmt->retry_remove ? "T " : "", - dmt->deferred_remove ? "D " : "", - dmt->secure_data ? "W " : "", - dmt->query_inactive_table ? "I " : "", - dmt->enable_checks ? "C" : "", + dmt->no_open_count ? "noopencount " : "opencount ", + dmt->no_flush ? "noflush " : "flush ", + dmt->read_only ? "readonly " : "", + dmt->skip_lockfs ? "skiplockfs " : "", + dmt->retry_remove ? "retryremove " : "", + dmt->deferred_remove ? "defferedremove " : "", + dmt->secure_data ? "securedata " : "", + dmt->query_inactive_table ? "inactive " : "", + dmt->enable_checks ? "enablechecks " : "", dmt->sector, _sanitise_message(dmt->message), dmi->data_size, retry_repeat_count); #ifdef DM_IOCTLS

1 0

master - preload: preserve flushing state
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5b2227c2c10c2f76… Commit: 5b2227c2c10c2f762e238fedb756850fe4ac5d5d Parent: 7c1937f8df1e843d00b9d5814c756234381ca0d1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 6 10:29:57 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:31:02 2016 +0200 preload: preserve flushing state When leaving preload routine it should not altet state of flush required when it's been already set to 1 and drop it to 0. The API here is unclean, but current usage expects the same variable pointer is for all preload calls and combines 'flush_required' across all of them. --- lib/activate/dev_manager.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 994ba80..b3e97db 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -3093,6 +3093,8 @@ int dev_manager_activate(struct dev_manager *dm, const struct logical_volume *lv int dev_manager_preload(struct dev_manager *dm, const struct logical_volume *lv, struct lv_activate_opts *laopts, int *flush_required) { + dm->flush_required = *flush_required; + if (!_tree_action(dm, lv, laopts, PRELOAD)) return_0;

1 0

master - suspend: fix suspend with noflush limitation
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7c1937f8df1e843d… Commit: 7c1937f8df1e843d00b9d5814c756234381ca0d1 Parent: d4c03cf7b21279ad28b8b9944d0281a55692efcc Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 6 10:29:05 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:31:02 2016 +0200 suspend: fix suspend with noflush limitation Commit 844b00958492224c448b30f89ae5532bb6591fd2 tried to move limit for usage of noflush to 'preload' however this was not correctly processed. Intead explicitly check for which types we do not want noflush and also add debug message in this case. --- lib/activate/activate.c | 10 ++++++++++ lib/activate/dev_manager.c | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index a3b2379..7afb439 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1933,6 +1933,16 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s, } } + /* Flush is ATM required for the tested cases + * NOTE: Mirror repair requires noflush for proper repair! + * TODO: Relax this limiting condition further */ + if (!flush_required && + (lv_is_pvmove(lv) || + (!lv_is_mirror(lv) && !lv_is_thin_pool(lv) && !lv_is_thin_volume(lv)))) { + log_debug("Requiring flush for LV %s.", display_lvname(lv)); + flush_required = 1; + } + if (!monitor_dev_for_events(cmd, lv, laopts, 0)) /* FIXME Consider aborting here */ stack; diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 22331c3..994ba80 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -3023,7 +3023,7 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv, break; case SUSPEND: dm_tree_skip_lockfs(root); - if (!dm->flush_required && !lv_is_pvmove(lv)) + if (!dm->flush_required) dm_tree_use_no_flush_suspend(root); /* Fall through */ case SUSPEND_WITH_LOCKFS:

1 0

master - mirror: fix flushing for mirror target
by Zdenek Kabelac 06 Apr '16

06 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d4c03cf7b21279ad… Commit: d4c03cf7b21279ad28b8b9944d0281a55692efcc Parent: 76fc41fb9d06519d7410f0054c279ea3a8dccc37 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 5 21:34:42 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 6 11:31:02 2016 +0200 mirror: fix flushing for mirror target Fix regression caused by commit ba41ee1dc94264f7ac8e61f8b1d56b10225b0d2f. The idea was to use no_flush for changed device only for thin volumes and thin pools but also to merge this with change made in commit 844b00958492224c448b30f89ae5532bb6591fd2. However the resulting condition has caused misbehavior for the mirror suspend - as that has been before the ONLY allowed target type that could have been suspended with noflush. Result was badly working repair for --type mirror that has been passing 'flush' to the repaired mirror target whenever preload wrongly set flush_required. The origin code has required the flush_required to be set whenever deivce size is changed. Now it first detects if device size got smaller 'dm_tree_node_size_changed(root) < 0' - this requires flush. Otherwise it checks device is not thin volume nor thin pool and its size has changed (got bigger) and requires flush. This mean upsize of thin-pool or thin volume will not require flush. --- lib/activate/dev_manager.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 3563d5a..22331c3 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -3044,12 +3044,11 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv, if ((dm_tree_node_size_changed(root) < 0)) dm->flush_required = 1; - /* Currently keep the code require flush for any - * non 'thin pool/volume, mirror' or with any size change */ - if (!lv_is_thin_volume(lv) && - !lv_is_thin_pool(lv) && - (!lv_is_mirror(lv) || dm_tree_node_size_changed(root))) + * non 'thin pool/volume' and size increase */ + else if (!lv_is_thin_volume(lv) && + !lv_is_thin_pool(lv) && + dm_tree_node_size_changed(root)) dm->flush_required = 1; if (action == ACTIVATE) {

1 0

v2_02_149 annotated tag has been created
by Alasdair Kergon 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7a02139d22551405… Commit: 7a02139d22551405d4317671a312ef5cc20c2db0 Parent: 0000000000000000000000000000000000000000 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: 2016-04-01 19:30 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: 2016-04-01 19:30 +0000 annotated tag: v2_02_149 has been created at 7a02139d22551405d4317671a312ef5cc20c2db0 (tag) tagging 2d0d58b8679f0d071c194db34660a112ae0f3204 (commit) replaces v2_02_148 Release 2.02.149. A small development release including fixes for some recent changes. 21 files changed, 265 insertions(+), 77 deletions(-) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iEYEABECAAYFAlb+zK8ACgkQIoGRwVZ+LBc/SQCfVsGYacni96Ps6N01aXCdqgFU EHUAn25BkfYNAAbt5Ob6PIEVIaGjmzD+ =DzKi -----END PGP SIGNATURE----- Alasdair G Kergon (3): post-commit Revert "thin: display highest mapped sector" pre-release Marian Csontos (1): test: Add missing directory Peter Rajnoha (13): dev-cache: handle situation where device is referenced in sysfs, but the node is not yet in dev dir dev-cache: also index VGIDs and LVIDs if using persistent .cache file dev-cache: remove spurious error msg if no value found in /sys/dev/block/<major>:<minor>/dm/uuid during dev scan dev-cache: dev_cache_index_devs fn is available unconditionally doc: describe lvmlockd/lvmpolld features as available if LVM compiled with lockd/polld support dev-cache: fix check for already indexed dev in _index_dev_by_vgid_and_lvid tests: vg-check-devs-used requires driver version 4.15 at least refactor: dev-cache: use btree instead of hash table for sysfs-only devices refactor: dev-cache: move code adding sysfs-only device into separate fn dev-cache: also add dev name for device found in sysfs only dev-cache: iterate devices in sysfs for VGID/LVID index if obtain_device_list_from_udev=0 fix: make udev_get_library_context available also for non-udev compilations dev-cache: skip VGID/LVID indexing if /sys/dev/block is not present Zdenek Kabelac (7): thin: no thin-pool flush when reading metadata status thin: display highest mapped sector cleanup: debug message fix cleanup: use TARGET define cleanup: use local var to read struct tests: do not test settings when MQ is emulated by SMQ tests: fixed cache target reacts faster

1 0

master - post-release
by Alasdair Kergon 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=76fc41fb9d06519d… Commit: 76fc41fb9d06519d7410f0054c279ea3a8dccc37 Parent: 2d0d58b8679f0d071c194db34660a112ae0f3204 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Apr 1 20:36:40 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Apr 1 20:36:40 2016 +0100 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 084a9cd..3a2d7d1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.149(2)-git (2016-04-01) +2.02.150(2)-git (2016-04-01) diff --git a/VERSION_DM b/VERSION_DM index 7fab3bb..77d3356 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.121-git (2016-04-01) +1.02.122-git (2016-04-01) diff --git a/WHATS_NEW b/WHATS_NEW index 32bb212..98168a1 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,3 +1,6 @@ +Version 2.02.150 - +================================= + Version 2.02.149 - 1st April 2016 ================================= Do not flush thin-pool when checking metadata fullness. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 3f044da..d84f8cf 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,6 @@ +Version 1.02.122 - +================================== + Version 1.02.121 - 26th March 2016 ================================== Adjust raid status function.

1 0

master - pre-release
by Alasdair Kergon 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2d0d58b8679f0d07… Commit: 2d0d58b8679f0d071c194db34660a112ae0f3204 Parent: 60befab7732d33bc29f796b6ff3743969b328240 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Apr 1 20:29:52 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Apr 1 20:29:52 2016 +0100 pre-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 4 ++-- WHATS_NEW_DM | 3 --- man/vgcreate.8.in | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 48f77ed..084a9cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.149(2)-git (2016-03-26) +2.02.149(2)-git (2016-04-01) diff --git a/VERSION_DM b/VERSION_DM index defda54..7fab3bb 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.122-git (2016-03-26) +1.02.121-git (2016-04-01) diff --git a/WHATS_NEW b/WHATS_NEW index 3237e0a..32bb212 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,5 @@ -Version 2.02.149 - -================================== +Version 2.02.149 - 1st April 2016 +================================= Do not flush thin-pool when checking metadata fullness. Remove spurious error about no value in /sys/dev/block/major:minor/dm/uuid. Fix device mismatch detection for LV if persistent .cache file is used. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index d84f8cf..3f044da 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,6 +1,3 @@ -Version 1.02.122 - -================================== - Version 1.02.121 - 26th March 2016 ================================== Adjust raid status function. diff --git a/man/vgcreate.8.in b/man/vgcreate.8.in index b0b01e4..764d76e 100644 --- a/man/vgcreate.8.in +++ b/man/vgcreate.8.in @@ -130,7 +130,7 @@ The 2.4 kernel has a limitation of 2TiB per block device. .TP .B \-\-shared -Create a shared VG using lvmlockd if LVM is copiled with lockd support. +Create a shared VG using lvmlockd if LVM is compiled with lockd support. lvmlockd will select lock type sanlock or dlm depending on which lock manager is running. This allows multiple hosts to share a VG on shared devices. lvmlockd and a lock manager must be configured and running. See

1 0

master - Revert "thin: display highest mapped sector"
by Alasdair Kergon 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=60befab7732d33bc… Commit: 60befab7732d33bc29f796b6ff3743969b328240 Parent: 42f04a0f77ee94b01d652d6c11d10e85aa46a897 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Apr 1 20:09:38 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Apr 1 20:09:38 2016 +0100 Revert "thin: display highest mapped sector" This reverts commit fc7dacaa4c6bf0af4c5a457c098da26d7cc71f9c. Let's put this information into a separate field. It doesn't meet the definition of the existing field. --- WHATS_NEW | 1 - lib/activate/dev_manager.c | 4 ---- lib/thin/thin.c | 15 ++++++--------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 2ad2d69..3237e0a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,6 +1,5 @@ Version 2.02.149 - ================================== - Report highest mapping for thin volume as Meta%. Do not flush thin-pool when checking metadata fullness. Remove spurious error about no value in /sys/dev/block/major:minor/dm/uuid. Fix device mismatch detection for LV if persistent .cache file is used. diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 5341b54..3563d5a 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -938,10 +938,6 @@ static int _percent_run(struct dev_manager *dm, const char *name, if (!segtype->ops->target_percent) continue; - /* For thin volume pass device size via 'total_numerator' */ - if (!seg && segtype_is_thin_volume(segtype)) - total_numerator = length - 1; /* highest mapped is 0 .. (length - 1) */ - if (!segtype->ops->target_percent(&dm->target_state, &percent, dm->mem, dm->cmd, seg, params, diff --git a/lib/thin/thin.c b/lib/thin/thin.c index c07859a..a850757 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -613,7 +613,7 @@ static int _thin_add_target_line(struct dev_manager *dm, static int _thin_target_percent(void **target_state __attribute__((unused)), dm_percent_t *percent, struct dm_pool *mem, - struct cmd_context *cmd, + struct cmd_context *cmd __attribute__((unused)), struct lv_segment *seg, char *params, uint64_t *total_numerator, @@ -643,18 +643,15 @@ static int _thin_target_percent(void **target_state __attribute__((unused)), *percent = dm_make_percent(s->mapped_sectors, csize); *total_denominator += csize; - *total_numerator += s->mapped_sectors; } else { - /* Using denominator to pass the mapped info upward? */ - if (s->highest_mapped_sector > *total_numerator) { - log_warn("WARNING: highest mapped sector %s is above device size.", - display_size(cmd, s->highest_mapped_sector)); - s->highest_mapped_sector = *total_numerator; - } - *percent = dm_make_percent(s->highest_mapped_sector, *total_numerator); + /* No lv_segment info here */ + *percent = DM_PERCENT_INVALID; + /* FIXME: Using denominator to pass the mapped info upward? */ *total_denominator += s->highest_mapped_sector; } + *total_numerator += s->mapped_sectors; + return 1; }

1 0

master - dev-cache: skip VGID/LVID indexing if /sys/dev/block is not present
by Peter Rajnoha 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=42f04a0f77ee94b0… Commit: 42f04a0f77ee94b01d652d6c11d10e85aa46a897 Parent: 9f28eb4c20ecb772f1b8a912c43f243d63a7e5f3 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Apr 1 17:04:11 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Apr 1 17:09:15 2016 +0200 dev-cache: skip VGID/LVID indexing if /sys/dev/block is not present /sys/dev/block is available since kernel version 2.2.26 (~ 2008): https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-dev The VGID/LVID indexing code relies on this feature so skip indexing if it's not available to avoid error messages about inability to open /sys/dev/block directory. We're not going to provide fallback code to read the /sys/block/ instead in this case as that's not that efficient - it needs extra reads for getting major:minor and reading partitions would also pose further reads and that's not worth it. --- lib/device/dev-cache.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 84bd85b..8461f40 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -818,9 +818,8 @@ static int _dev_cache_iterate_devs_for_index(void) return r; } -static int _dev_cache_iterate_sysfs_for_index(void) +static int _dev_cache_iterate_sysfs_for_index(const char *path) { - char path[PATH_MAX]; char devname[PATH_MAX]; DIR *d; struct dirent *dirent; @@ -830,11 +829,6 @@ static int _dev_cache_iterate_sysfs_for_index(void) int partial_failure = 0; int r = 0; - if (dm_snprintf(path, sizeof(path), "%sdev/block", dm_sysfs_dir()) < 0) { - log_error("_dev_cache_iterate_sysfs_for_index: dm_snprintf failed."); - return 0; - } - if (!(d = opendir(path))) { log_sys_error("opendir", path); return 0; @@ -876,11 +870,36 @@ static int _dev_cache_iterate_sysfs_for_index(void) int dev_cache_index_devs(void) { + static int sysfs_has_dev_block = -1; + char path[PATH_MAX]; + + if (dm_snprintf(path, sizeof(path), "%sdev/block", dm_sysfs_dir()) < 0) { + log_error("dev_cache_index_devs: dm_snprintf failed."); + return 0; + } + + /* Skip indexing if /sys/dev/block is not available.*/ + if (sysfs_has_dev_block == -1) { + struct stat info; + if (stat(path, &info) == 0) + sysfs_has_dev_block = 1; + else { + if (errno == ENOENT) { + sysfs_has_dev_block = 0; + return 1; + } else { + log_sys_error("stat", path); + return 0; + } + } + } else if (!sysfs_has_dev_block) + return 1; + int with_udev = obtain_device_list_from_udev() && udev_get_library_context(); return with_udev ? _dev_cache_iterate_devs_for_index() - : _dev_cache_iterate_sysfs_for_index(); + : _dev_cache_iterate_sysfs_for_index(path); } #ifdef UDEV_SYNC_SUPPORT

1 0

master - fix: make udev_get_library_context available also for non-udev compilations
by Peter Rajnoha 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9f28eb4c20ecb772… Commit: 9f28eb4c20ecb772f1b8a912c43f243d63a7e5f3 Parent: 15d1824facce1ac38c2669b17c8c0965b8c18f3e Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Apr 1 15:35:13 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Apr 1 15:35:22 2016 +0200 fix: make udev_get_library_context available also for non-udev compilations If compiling without udev_sync support, udev_get_library_context simply returns NULL so we don't need to remember putting ifdef UDEV_SYNC_SUPPORT in the code all the time we just need to check whether there's any udev context initialized or not. --- lib/misc/lvm-wrappers.c | 7 ++++++- lib/misc/lvm-wrappers.h | 6 +----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/misc/lvm-wrappers.c b/lib/misc/lvm-wrappers.c index e8e2e92..e2b14aa 100644 --- a/lib/misc/lvm-wrappers.c +++ b/lib/misc/lvm-wrappers.c @@ -66,7 +66,7 @@ bad: return 0; } -struct udev* udev_get_library_context(void) +void *udev_get_library_context(void) { return _udev; } @@ -78,6 +78,11 @@ int udev_init_library_context(void) return 1; } +void *udev_get_library_context(void) +{ + return NULL; +} + void udev_fin_library_context(void) { } diff --git a/lib/misc/lvm-wrappers.h b/lib/misc/lvm-wrappers.h index c2d5123..3c45aff 100644 --- a/lib/misc/lvm-wrappers.h +++ b/lib/misc/lvm-wrappers.h @@ -16,12 +16,8 @@ #ifndef _LVM_WRAPPERS_H #define _LVM_WRAPPERS_H -#ifdef UDEV_SYNC_SUPPORT -struct udev; -struct udev *udev_get_library_context(void); -#endif - int udev_init_library_context(void); +void *udev_get_library_context(void); void udev_fin_library_context(void); int udev_is_running(void);

1 0

master - dev-cache: iterate devices in sysfs for VGID/LVID index if obtain_device_list_from_udev=0
by Peter Rajnoha 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=15d1824facce1ac3… Commit: 15d1824facce1ac38c2669b17c8c0965b8c18f3e Parent: 7ed5a65ee5ccb92de388977cff0dc697045ffc09 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Apr 1 11:34:09 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Apr 1 14:49:39 2016 +0200 dev-cache: iterate devices in sysfs for VGID/LVID index if obtain_device_list_from_udev=0 If obtain_device_list_from_udev=0, LVM can make use of persistent .cache file. This cache file contains only devices which underwent filters in previous LVM command run. But we need to iterate over all block devices to create the VGID/LVID index completely for the device mismatch check to be complete as well. This patch iterates over block devices found in sysfs to generate the VGID/LVID index in dev cache if obtain_device_list_from_udev=0 (if obtain_device_list_from_udev=1, we always read complete list of block devices from udev and we ignore .cache file so we don't need to look in sysfs for the complete list). --- lib/device/dev-cache.c | 82 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 74 insertions(+), 8 deletions(-) diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 27540d9..84bd85b 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -684,14 +684,15 @@ static int _insert_dev(const char *path, dev_t d) } /* is this device already registered ? */ - if (!(dev = (struct device *) btree_lookup(_cache.devices, - (uint32_t) d))) { - /* create new device */ - if (loopfile) { - if (!(dev = dev_create_file(path, NULL, NULL, 0))) + if (!(dev = (struct device *) btree_lookup(_cache.devices, (uint32_t) d))) { + if (!(dev = (struct device *) btree_lookup(_cache.sysfs_only_devices, (uint32_t) d))) { + /* create new device */ + if (loopfile) { + if (!(dev = dev_create_file(path, NULL, NULL, 0))) + return_0; + } else if (!(dev = _dev_create(d))) return_0; - } else if (!(dev = _dev_create(d))) - return_0; + } if (!(btree_insert(_cache.devices, (uint32_t) d, dev))) { log_error("Couldn't insert device into binary tree."); @@ -799,7 +800,7 @@ static int _insert_file(const char *path) return 1; } -int dev_cache_index_devs(void) +static int _dev_cache_iterate_devs_for_index(void) { struct btree_iter *iter = btree_first(_cache.devices); struct device *dev; @@ -817,6 +818,71 @@ int dev_cache_index_devs(void) return r; } +static int _dev_cache_iterate_sysfs_for_index(void) +{ + char path[PATH_MAX]; + char devname[PATH_MAX]; + DIR *d; + struct dirent *dirent; + int major, minor; + dev_t devno; + struct device *dev; + int partial_failure = 0; + int r = 0; + + if (dm_snprintf(path, sizeof(path), "%sdev/block", dm_sysfs_dir()) < 0) { + log_error("_dev_cache_iterate_sysfs_for_index: dm_snprintf failed."); + return 0; + } + + if (!(d = opendir(path))) { + log_sys_error("opendir", path); + return 0; + } + + while ((dirent = readdir(d))) { + if (!strcmp(".", dirent->d_name) || + !strcmp("..", dirent->d_name)) + continue; + + if (sscanf(dirent->d_name, "%d:%d", &major, &minor) != 2) { + log_error("_dev_cache_iterate_sysfs_for_index: %s: failed " + "to get major and minor number", dirent->d_name); + partial_failure = 1; + continue; + } + + devno = MKDEV(major, minor); + if (!(dev = (struct device *) btree_lookup(_cache.devices, (uint32_t) devno)) && + !(dev = (struct device *) btree_lookup(_cache.sysfs_only_devices, (uint32_t) devno))) { + if (!dm_device_get_name(major, minor, 1, devname, sizeof(devname)) || + !(dev = _insert_sysfs_dev(devno, devname))) { + partial_failure = 1; + continue; + } + } + + if (!_index_dev_by_vgid_and_lvid(dev)) + partial_failure = 1; + } + + r = !partial_failure; + + if (closedir(d)) + log_sys_error("closedir", path); + + return r; +} + +int dev_cache_index_devs(void) +{ + int with_udev = obtain_device_list_from_udev() && + udev_get_library_context(); + + return with_udev ? _dev_cache_iterate_devs_for_index() + : _dev_cache_iterate_sysfs_for_index(); +} + #ifdef UDEV_SYNC_SUPPORT static int _device_in_udev_db(const dev_t d)

1 0

master - dev-cache: also add dev name for device found in sysfs only
by Peter Rajnoha 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7ed5a65ee5ccb92d… Commit: 7ed5a65ee5ccb92de388977cff0dc697045ffc09 Parent: 91d32f9d1ba1ff3bed0f47104721e97960df3878 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Apr 1 10:09:03 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Apr 1 14:48:56 2016 +0200 dev-cache: also add dev name for device found in sysfs only For the case when we print device name associated with struct device that was not found in /dev, but in sysfs, for example when printing devices where LV device mismatch is found. --- lib/device/dev-cache.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 12dcceb..27540d9 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -433,11 +433,29 @@ static struct dm_list *_get_or_add_list_by_index_key(struct dm_hash_table *idx, static struct device *_insert_sysfs_dev(dev_t devno, const char *devname) { + char path[PATH_MAX]; + char *path_copy; struct device *dev; + if (dm_snprintf(path, sizeof(path), "%s%s", _cache.dev_dir, devname) < 0) { + log_error("_insert_sysfs_dev: %s: dm_snprintf failed", devname); + return NULL; + } + if (!(dev = _dev_create(devno))) return_NULL; + if (!(path_copy = dm_pool_strdup(_cache.mem, path))) { + log_error("_insert_sysfs_dev: %s: dm_pool_strdup failed", devname); + return NULL; + } + + if (!_add_alias(dev, path_copy)) { + log_error("Couldn't add alias to dev cache."); + _free(dev); + return NULL; + } + if (!btree_insert(_cache.sysfs_only_devices, (uint32_t) devno, dev)) { log_error("Couldn't add device to binary tree of sysfs-only devices in dev cache."); _free(dev);

1 0

master - refactor: dev-cache: move code adding sysfs-only device into separate fn
by Peter Rajnoha 01 Apr '16

01 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=91d32f9d1ba1ff3b… Commit: 91d32f9d1ba1ff3bed0f47104721e97960df3878 Parent: 0e774d5ae77fb67c7a015d9bb8e4c289dd8fa2e4 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Apr 1 09:41:41 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Apr 1 11:47:06 2016 +0200 refactor: dev-cache: move code adding sysfs-only device into separate fn --- lib/device/dev-cache.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index d99352b..12dcceb 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -431,6 +431,22 @@ static struct dm_list *_get_or_add_list_by_index_key(struct dm_hash_table *idx, return list; } +static struct device *_insert_sysfs_dev(dev_t devno, const char *devname) +{ + struct device *dev; + + if (!(dev = _dev_create(devno))) + return_NULL; + + if (!btree_insert(_cache.sysfs_only_devices, (uint32_t) devno, dev)) { + log_error("Couldn't add device to binary tree of sysfs-only devices in dev cache."); + _free(dev); + return NULL; + } + + return dev; +} + static struct device *_get_device_for_sysfs_dev_name_using_devno(const char *devname) { char path[PATH_MAX]; @@ -440,7 +456,7 @@ static struct device *_get_device_for_sysfs_dev_name_using_devno(const char *dev struct device *dev; if (dm_snprintf(path, sizeof(path), "%sblock/%s/dev", dm_sysfs_dir(), devname) < 0) { - log_error("_get_device_for_non_dm_dev: %s: dm_snprintf failed", devname); + log_error("_get_device_for_sysfs_dev_name_using_devno: %s: dm_snprintf failed", devname); return NULL; } @@ -448,7 +464,7 @@ static struct device *_get_device_for_sysfs_dev_name_using_devno(const char *dev return_NULL; if (sscanf(buf, "%d:%d", &major, &minor) != 2) { - log_error("_get_device_for_non_dm_dev: %s: failed to get major and minor number", devname); + log_error("_get_device_for_sysfs_dev_name_using_devno: %s: failed to get major and minor number", devname); return NULL; } @@ -465,14 +481,9 @@ static struct device *_get_device_for_sysfs_dev_name_using_devno(const char *dev * where different directory for dev nodes is used (e.g. our test suite). So track * such devices in _cache.sysfs_only_devices hash for the vgid/lvid check to work still. */ - if (!(dev = (struct device *) btree_lookup(_cache.sysfs_only_devices, (uint32_t) devno))) { - if (!(dev = _dev_create(devno))) - return_NULL; - if (!btree_insert(_cache.sysfs_only_devices, (uint32_t) devno, dev)) { - log_error("Couldn't add device to binary tree of sysfs-only devices in dev cache."); - return NULL; - } - } + if (!(dev = (struct device *) btree_lookup(_cache.sysfs_only_devices, (uint32_t) devno)) && + !(dev = _insert_sysfs_dev(devno, devname))) + return_NULL; } return dev;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits April 2016