lvm2-commits June 2019

lvm2-commits@lists.fedorahosted.org

3 participants
101 discussions

master - test: Remove now useless clvmd test
by Marian Csontos 27 Jun '19

27 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ba9d152aa5552f2b6d9ea… Commit: ba9d152aa5552f2b6d9ea3acf5ae644dc4dd1596 Parent: 09f29570f2dac1a84f5ee24107df6461194b269a Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Jun 27 11:14:00 2019 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Jun 27 11:14:00 2019 +0200 test: Remove now useless clvmd test --- test/shell/clvmd-restart.sh | 73 ------------------------------------------- 1 files changed, 0 insertions(+), 73 deletions(-) diff --git a/test/shell/clvmd-restart.sh b/test/shell/clvmd-restart.sh deleted file mode 100644 index 7e3257a..0000000 --- a/test/shell/clvmd-restart.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (C) 2011-2015 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 - -# set before test's clvmd is started, so it's passed in environ -export LVM_CLVMD_BINARY=clvmd -export LVM_BINARY=lvm - -SKIP_WITH_LVMLOCKD=1 -SKIP_WITHOUT_CLVMD=1 -SKIP_WITH_LVMPOLLD=1 - -. lib/inittest - -# only clvmd based test, skip otherwise -read -r LOCAL_CLVMD < LOCAL_CLVMD - -# TODO read from build, for now hardcoded -CLVMD_SOCKET="/var/run/lvm/clvmd.sock" - -restart_clvmd_() { - "$LVM_CLVMD_BINARY" -S - ls -la "$CLVMD_SOCKET" || true - - for i in $(seq 1 20) ; do - test -S "$CLVMD_SOCKET" && break - sleep .1 - done - # restarted clvmd has the same PID (no fork, only execvp) - NEW_LOCAL_CLVMD=$(pgrep clvmd) - test "$LOCAL_CLVMD" -eq "$NEW_LOCAL_CLVMD" -} - -aux prepare_vg - -lvcreate -an --zero n -n $lv1 -l1 $vg -lvcreate -an --zero n -n $lv2 -l1 $vg -lvcreate -l1 $vg - -lvchange -aey $vg/$lv1 -lvchange -aey $vg/$lv2 - -restart_clvmd_ - -# try restart once more -restart_clvmd_ - -# FIXME: Hmm - how could we test exclusivity is preserved in singlenode ? -lvchange -an $vg/$lv1 -lvchange -aey $vg/$lv1 -lvcreate -s -l3 -n snap $vg/$lv1 - -"$LVM_CLVMD_BINARY" -R - -vgchange -an $vg - -# Test what happens after 'reboot' -kill "$LOCAL_CLVMD" -while test -e "$CLVMD_PIDFILE"; do echo -n .; sleep .1; done # wait for the pid removal -aux prepare_clvmd - -vgchange -ay $vg -lvremove -f $vg/snap - -vgremove -ff $vg

1 0

master - test: Fix unbound variable
by Marian Csontos 27 Jun '19

27 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=09f29570f2dac1a84f5ee… Commit: 09f29570f2dac1a84f5ee24107df6461194b269a Parent: 9ba45d824adc91b5767fd7a26c3ba83f7b23b250 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Jun 27 10:41:21 2019 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Jun 27 10:41:21 2019 +0200 test: Fix unbound variable Test `aux kernel_at_least 5 1` fails even for newer kernel with `$3: unbound variable` when using `set -u`. --- test/lib/aux.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 09ef9ed..0cc26a4 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -1387,17 +1387,17 @@ version_at_least() { IFS=".-" read -r major minor revision <<< "$1" shift - test -z "$1" && return 0 + test -z "${1:-}" && return 0 test -n "$major" || return 1 test "$major" -gt "$1" && return 0 test "$major" -eq "$1" || return 1 - test -z "$2" && return 0 + test -n "$2" || return 0 test -n "$minor" || return 1 test "$minor" -gt "$2" && return 0 test "$minor" -eq "$2" || return 1 - test -z "$3" && return 0 + test -n "$3" || return 0 test "$revision" -ge "$3" 2>/dev/null || return 1 } #

1 0

stable-2.02 - pvremove/vgextend: fix using device aliases with lvmetad
by David Teigland 26 Jun '19

26 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b13ebfa4c289a5bc6eb4f… Commit: b13ebfa4c289a5bc6eb4f8ba26126db8e6d78296 Parent: b62c0787debeb3a66a2e3658d1edb8a61a6f247b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Jun 26 16:03:42 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Jun 26 16:06:23 2019 -0500 pvremove/vgextend: fix using device aliases with lvmetad These commands were looking for the requested device alias before dev_cache_scan had created the list of devs on the system, so they would fail and report the dev wasn't found. --- tools/toollib.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/toollib.c b/tools/toollib.c index 3221e5f..1b01ccc 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -5544,6 +5544,15 @@ int pvcreate_each_device(struct cmd_context *cmd, lvmcache_label_scan(cmd); /* + * When using lvmetad, we want to do a dev cache scan here (if not done + * already) so that the dev_cache_get just below will be able to find + * device aliases. When not using lvmetad, the label_scan just above + * has done dev_cache_scan, and this will not be run. + */ + if (!dev_cache_has_scanned()) + dev_cache_scan(); + + /* * Translate arg names into struct device's. */ dm_list_iterate_items(pd, &pp->arg_devices)

1 0

master - tests: add exported.sh
by David Teigland 25 Jun '19

25 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9ba45d824adc91b5767fd… Commit: 9ba45d824adc91b5767fd7a26c3ba83f7b23b250 Parent: b4402bd821723067c2becaf8e2a0452d4896cfd7 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 25 15:45:47 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 25 15:45:47 2019 -0500 tests: add exported.sh to test how commands work with exported VGs/PVs. --- test/shell/exported.sh | 207 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 207 insertions(+), 0 deletions(-) diff --git a/test/shell/exported.sh b/test/shell/exported.sh new file mode 100644 index 0000000..b6d17ce --- /dev/null +++ b/test/shell/exported.sh @@ -0,0 +1,207 @@ +#!/usr/bin/env bash + +# Copyright (C) 2008-2013,2018 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 + +. lib/inittest + +# Check what is and is not permitted on an exported VG/PV + +aux prepare_devs 3 +get_devs + +vgcreate $vg1 "$dev1" +vgcreate $vg2 "$dev2" + +lvcreate -l1 -n $lv1 -an $vg1 +lvcreate -l1 -n $lv2 -an $vg2 + +vgchange --addtag aa $vg1 +lvchange --addtag bb $vg1/$lv1 + +# vgexport only when no lvs are active +lvchange -ay $vg1/$lv1 +not vgexport $vg1 +lvchange -an $vg1/$lv1 + +vgexport $vg1 + +lvm fullreport |tee out +grep $vg1 out + +lvm fullreport $vg1 |tee out +grep $vg1 out + +not lvchange -ay $vg1 +not lvchange -ay $vg1/$lv1 +not lvchange --addtag bar $vg1/$lv1 +not lvchange --monitor y $vg1/$lv1 + +not lvconvert --type mirror $vg1/$lv1 + +not lvcreate -l1 $vg1 + +not lvdisplay $vg1 + +lvdisplay 2>&1|tee out +not grep $vg1 out + +not lvextend -l+1 $vg1/$lv1 + +lvmdiskscan 2>&1|tee foo +grep "$dev1" foo + +not lvreduce -l-1 $vg1/$lv1 + +not lvremove $vg1 +not lvremove $vg1/$lv1 + +not lvrename $vg1 $lv1 $lv2 + +not lvresize --size 1M $vg1/$lv1 + +not lvs $vg1 + +lvs 2>&1|tee out +not grep $vg1 out + +lvscan 2>&1|tee out +not grep $vg1 out + +not pvchange --addtag cc "$dev1" +pvs -o+tags "$dev1" 2>&1|tee out +grep "$dev1" out +not grep cc out + +pvs -osize "$dev1" > before +not pvresize --setphysicalvolumesize 100M "$dev1" +pvs -osize "$dev1" > after +diff before after + +pvck "$dev1" +pvck --dump headers "$dev1" > out +grep "label_header at 512" out + +not pvcreate "$dev1" + +pvdisplay "$dev1" 2>&1|tee out +grep "$dev1" out + +not pvmove "$dev1" + +not pvremove "$dev1" + +pvs "$dev1" 2>&1|tee out +grep "$dev1" out + +pvscan 2>&1|tee out +grep "$dev1" out + +pvscan --cache 2>&1|tee out +grep "$dev1" out + +vgcfgbackup $vg1 + +vgcfgrestore $vg1 + +not vgchange -ay $vg1 +not vgchange --addtag asdf $vg1 +not vgchange --monitor y $vg1 + +not vgck $vg1 + +not vgcreate $vg1 "$dev3" + +vgdisplay $vg1 2>&1|tee out +grep $vg1 out + +not vgexport $vg1 + +vgexport $vg2 +not lvcreate -l1 -n $lv3 -an $vg2 +vgimport $vg2 +lvcreate -l1 -n $lv3 -an $vg2 +lvremove $vg2/$lv3 + +not vgextend $vg1 "$dev3" + +not vgmerge $vg1 $vg2 + +not vgmknodes $vg1 + +not vgreduce --removemissing $vg1 + +not vgremove $vg1 + +vgrename $vg1 $vg3 +vgrename $vg3 $vg1 + +vgs $vg1 2>&1|tee out +grep $vg1 out + +vgscan 2>&1|tee out +grep $vg1 out + +# pvscan --cache tracks online state of exported PVs, +# but autoactivation should not activate LVs. +pvscan --cache -aay "$dev1" +vgimport $vg1 +check inactive $vg1 $lv1 +vgexport $vg1 + +# using a tag does not give access to exported vg +lvchange -ay @foo +vgimport $vg1 +check inactive $vg1 $lv1 +vgexport $vg1 + +# using select does not give access to exported vg +lvchange -ay --select lvname=$lv1 +vgimport $vg1 +check inactive $vg1 $lv1 +vgexport $vg1 + +# tag or select do not work with vgremove on exported vg +vgremove @foo +vgs $vg1 +vgremove --select vgname=$vg1 +vgs $vg1 + +# exported vg is skipped without error when not named +vgchange -ay +vgimport $vg1 +check inactive $vg1 $lv1 +vgexport $vg1 + +# exported vg is skipped without error when not named +vgchange --addtag newtag +vgs -o tags $vg1 > out +not grep newtag out +vgchange --deltag aa +vgs -o tags $vg1 > out +grep aa out + +# exported vg is skipped without error when not named +vgchange --monitor y +vgchange --monitor n + +vgimport $vg1 +vgextend $vg1 "$dev3" +vgexport $vg1 + +not vgreduce $vg1 "$dev3" + +not vgsplit $vg1 "$vg3" "$dev3" + +# For vgimportclone see vgimportclone.sh + +vgimport $vg1 +vgremove -ff $vg1 +vgremove -ff $vg2

1 0

master - exported vg handling
by David Teigland 25 Jun '19

25 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b4402bd821723067c2bec… Commit: b4402bd821723067c2becaf8e2a0452d4896cfd7 Parent: d16142f90fdcf2aef42a51ecabd0c4ff11733d7c Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 21 13:37:11 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 25 15:39:08 2019 -0500 exported vg handling The exported VG checking/enforcement was scattered and inconsistent. This centralizes it and makes it consistent, following the existing approach for foreign and shared VGs/PVs, which are very similar to exported VGs/PVs. The access policy that now applies to foreign/shared/exported VGs/PVs, is that if a foreign/shared/exported VG/PV is named on the command line (i.e. explicitly requested by the user), and the command is not permitted to operate on it because it is foreign/shared/exported, then an access error is reported and the command exits with an error. But, if the command is processing all VGs/PVs, and happens to come across a foreign/shared/exported VG/PV (that is not explicitly named on the command line), then the command silently skips it and does not produce an error. A command using tags or --select handles inaccessible VGs/PVs the same way as a command processing all VGs/PVs, and will not report/return errors if these inaccessible VGs/PVs exist. The new policy fixes the exit codes on a somewhat random set of commands that previously exited with an error if they were looking at all VGs/PVs and an exported VG existed on the system. There should be no change to which commands are allowed/disallowed on exported VGs/PVs. Certain LV commands (lvs/lvdisplay/lvscan) would previously not display LVs from an exported VG (for unknown reasons). This has not changed. The lvm fullreport command would previously report info about an exported VG but not about the LVs in it. This has changed to include all info from the exported VG. --- lib/commands/toolcontext.h | 1 + lib/metadata/metadata-exported.h | 1 - lib/metadata/metadata.c | 44 ++++++++++++++++++++----------- tools/command.c | 1 + tools/commands.h | 29 +++++++++++---------- tools/lvmcmdline.c | 2 + tools/pvchange.c | 7 +---- tools/pvresize.c | 7 +---- tools/toollib.c | 52 ++++++++++++++++++++++++++++++-------- tools/tools.h | 2 + tools/vgchange.c | 22 +++------------- tools/vgck.c | 3 -- tools/vgimport.c | 6 +--- tools/vgimportclone.c | 4 +- tools/vgreduce.c | 5 +-- tools/vgremove.c | 3 -- tools/vgrename.c | 3 +- tools/vgsplit.c | 12 +++++++- 18 files changed, 113 insertions(+), 91 deletions(-) diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index 6e4530c..488752c 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -148,6 +148,7 @@ struct cmd_context { unsigned unknown_system_id:1; unsigned include_historical_lvs:1; /* also process/report/display historical LVs */ unsigned record_historical_lvs:1; /* record historical LVs */ + unsigned include_exported_vgs:1; unsigned include_foreign_vgs:1; /* report/display cmds can reveal foreign VGs */ unsigned include_shared_vgs:1; /* report/display cmds can reveal lockd VGs */ unsigned include_active_foreign_vgs:1; /* cmd should process foreign VGs with active LVs */ diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 966c88f..f18587a 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -181,7 +181,6 @@ #define MIRROR_SKIP_INIT_SYNC 0x00000010U /* skip initial sync */ /* vg_read and vg_read_for_update flags */ -#define READ_ALLOW_EXPORTED 0x00020000U #define READ_OK_NOTFOUND 0x00040000U #define READ_WARN_INCONSISTENT 0x00080000U #define READ_FOR_UPDATE 0x00100000U /* command tells vg_read it plans to write the vg */ diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 7b0d6ce..121cf4f 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -593,9 +593,6 @@ int vg_remove_check(struct volume_group *vg) return 0; } - if (!vg_check_status(vg, EXPORTED_VG)) - return 0; - lv_count = vg_visible_lvs(vg); if (lv_count) { @@ -3709,12 +3706,6 @@ uint32_t vg_bad_status_bits(const struct volume_group *vg, uint64_t status) /* Return because other flags are considered undefined. */ return FAILED_CLUSTERED; - if ((status & EXPORTED_VG) && - vg_is_exported(vg)) { - log_error("Volume group %s is exported", vg->name); - failure |= FAILED_EXPORTED; - } - if ((status & LVM_WRITE) && !(vg->status & LVM_WRITE)) { log_error("Volume group %s is read-only", vg->name); @@ -3733,7 +3724,7 @@ uint32_t vg_bad_status_bits(const struct volume_group *vg, uint64_t status) /** * vg_check_status - check volume group status flags and log error * @vg - volume group to check status flags - * @status - specific status flags to check (e.g. EXPORTED_VG) + * @status - specific status flags to check */ int vg_check_status(const struct volume_group *vg, uint64_t status) { @@ -3914,6 +3905,28 @@ static int _access_vg_systemid(struct cmd_context *cmd, struct volume_group *vg) return 0; } +static int _access_vg_exported(struct cmd_context *cmd, struct volume_group *vg) +{ + if (!vg_is_exported(vg)) + return 1; + + if (cmd->include_exported_vgs) + return 1; + + /* + * Some commands want the error printed by vg_read, others by ignore_vg. + * Those using ignore_vg may choose to skip the error. + */ + if (cmd->vg_read_print_access_error) { + log_error("Volume group %s is exported", vg->name); + return 0; + } + + /* Silently ignore exported vgs. */ + + return 0; +} + /* * Test the validity of a VG handle returned by vg_read() or vg_read_for_update(). */ @@ -4898,18 +4911,17 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const goto_bad; } + if (!_access_vg_exported(cmd, vg)) { + failure |= FAILED_EXPORTED; + goto_bad; + } + /* * If the command intends to write or activate the VG, there are * additional restrictions. FIXME: These restrictions should * probably be checked/applied after vg_read returns. */ if (writing || activating) { - if (!(read_flags & READ_ALLOW_EXPORTED) && vg_is_exported(vg)) { - log_error("Volume group %s is exported", vg->name); - failure |= FAILED_EXPORTED; - goto_bad; - } - if (!(vg->status & LVM_WRITE)) { log_error("Volume group %s is read-only", vg->name); failure |= FAILED_READ_ONLY; diff --git a/tools/command.c b/tools/command.c index bdd18d6..724040e 100644 --- a/tools/command.c +++ b/tools/command.c @@ -137,6 +137,7 @@ static inline int configtype_arg(struct cmd_context *cmd __attribute__((unused)) #define GET_VGNAME_FROM_OPTIONS 0x00001000 #define CAN_USE_ONE_SCAN 0x00002000 #define ALLOW_HINTS 0x00004000 +#define ALLOW_EXPORTED 0x00008000 /* create foo_CMD enums for command def ID's in command-lines.in */ diff --git a/tools/commands.h b/tools/commands.h index 4006fab..c1670ae 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -35,7 +35,7 @@ xx(help, xx(fullreport, "Display full report", - PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_HINTS) + PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_HINTS | ALLOW_EXPORTED) xx(lastlog, "Display last command's log report", @@ -71,7 +71,7 @@ xx(lvmconfig, xx(lvmdiskscan, "List devices that may be used as physical volumes", - PERMITTED_READ_ONLY | ENABLE_ALL_DEVS) + PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ALLOW_EXPORTED) xx(lvmsadc, "Collect activity data", @@ -115,7 +115,7 @@ xx(pvresize, xx(pvck, "Check metadata on physical volumes", - LOCKD_VG_SH) + LOCKD_VG_SH | ALLOW_EXPORTED) xx(pvcreate, "Initialize physical volume(s) for use by LVM", @@ -127,7 +127,7 @@ xx(pvdata, xx(pvdisplay, "Display various attributes of physical volume(s)", - PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS) + PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED) /* ALL_VGS_IS_DEFAULT is for polldaemon to find pvmoves in-progress using process_each_vg. */ @@ -145,11 +145,11 @@ xx(pvremove, xx(pvs, "Display information about physical volumes", - PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS) + PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED) xx(pvscan, "List all physical volumes", - PERMITTED_READ_ONLY | LOCKD_VG_SH) + PERMITTED_READ_ONLY | LOCKD_VG_SH | ALLOW_EXPORTED) xx(segtypes, "List available segment types", @@ -165,11 +165,11 @@ xx(tags, xx(vgcfgbackup, "Backup volume group configuration(s)", - PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH) + PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_EXPORTED) xx(vgcfgrestore, "Restore volume group configuration", - 0) + ALLOW_EXPORTED) xx(vgchange, "Change volume group attributes", @@ -189,7 +189,7 @@ xx(vgcreate, xx(vgdisplay, "Display volume group information", - PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS) + PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED) xx(vgexport, "Unregister volume group(s) from the system", @@ -201,10 +201,11 @@ xx(vgextend, xx(vgimport, "Register exported volume group with system", - ALL_VGS_IS_DEFAULT) + ALL_VGS_IS_DEFAULT | ALLOW_EXPORTED) xx(vgimportclone, - "Import a VG from cloned PVs", 0) + "Import a VG from cloned PVs", + ALLOW_EXPORTED) xx(vgmerge, "Merge volume groups", @@ -224,15 +225,15 @@ xx(vgremove, xx(vgrename, "Rename a volume group", - ALLOW_UUID_AS_NAME) + ALLOW_UUID_AS_NAME | ALLOW_EXPORTED) xx(vgs, "Display information about volume groups", - PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS) + PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | CAN_USE_ONE_SCAN | ALLOW_HINTS | ALLOW_EXPORTED) xx(vgscan, "Search for all volume groups", - PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH) + PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | ALLOW_EXPORTED) xx(vgsplit, "Move physical volumes into a new or existing volume group", diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 3fec702..30f9d81 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -2315,6 +2315,8 @@ static int _get_current_settings(struct cmd_context *cmd) if (cmd->cname->flags & CAN_USE_ONE_SCAN) cmd->can_use_one_scan = 1; + cmd->include_exported_vgs = (cmd->cname->flags & ALLOW_EXPORTED) ? 1 : 0; + cmd->scan_lvs = find_config_tree_bool(cmd, devices_scan_lvs_CFG, NULL); /* diff --git a/tools/pvchange.c b/tools/pvchange.c index f37fd91..1ece34a 100644 --- a/tools/pvchange.c +++ b/tools/pvchange.c @@ -35,11 +35,6 @@ static int _pvchange_single(struct cmd_context *cmd, struct volume_group *vg, params->total++; - if (vg && vg_is_exported(vg)) { - log_error("Volume group %s is exported", vg->name); - goto bad; - } - /* * The primary location of this check is in vg_write(), but it needs * to be copied here to prevent the pv_write() which is called before @@ -239,7 +234,7 @@ int pvchange(struct cmd_context *cmd, int argc, char **argv) clear_hint_file(cmd); - ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, handle, _pvchange_single); + ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE, handle, _pvchange_single); log_print_unless_silent("%d physical volume%s changed / %d physical volume%s not changed", params.done, params.done == 1 ? "" : "s", diff --git a/tools/pvresize.c b/tools/pvresize.c index c7e750d..2c7f543 100644 --- a/tools/pvresize.c +++ b/tools/pvresize.c @@ -36,11 +36,6 @@ static int _pvresize_single(struct cmd_context *cmd, } params->total++; - if (vg && vg_is_exported(vg)) { - log_error("Volume group %s is exported", vg->name); - return ECMD_FAILED; - } - /* * Needed to change a property on an orphan PV. * i.e. the global lock is only needed for orphans. @@ -93,7 +88,7 @@ int pvresize(struct cmd_context *cmd, int argc, char **argv) handle->custom_handle = &params; - ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, handle, _pvresize_single); + ret = process_each_pv(cmd, argc, argv, NULL, 0, READ_FOR_UPDATE, handle, _pvresize_single); log_print_unless_silent("%d physical volume(s) resized or updated / %d physical volume(s) " "not resized", params.done, params.total - params.done); diff --git a/tools/toollib.c b/tools/toollib.c index 506ad2d..b2313f8 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -223,6 +223,17 @@ static int _ignore_vg(struct cmd_context *cmd, } } + if (read_error & FAILED_EXPORTED) { + if (arg_vgnames && str_list_match_item(arg_vgnames, vg_name)) { + log_error("Volume group %s is exported", vg_name); + return 1; + } else { + read_error &= ~FAILED_EXPORTED; /* Check for other errors */ + log_verbose("Skipping exported volume group %s", vg_name); + *skip = 1; + } + } + /* * Commands that operate on "all vgs" shouldn't be bothered by * skipping a foreign VG, and the command shouldn't fail when @@ -3032,11 +3043,6 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg, dm_list_init(&final_lvs); dm_list_init(&found_arg_lvnames); - if (!vg_check_status(vg, EXPORTED_VG)) { - ret_max = ECMD_FAILED; - goto_out; - } - if (tags_in && !dm_list_empty(tags_in)) tags_supplied = 1; @@ -4161,6 +4167,7 @@ static int _process_pvs_in_vg(struct cmd_context *cmd, int process_all_pvs, int process_all_devices, int skip, + uint32_t error_flags, struct processing_handle *handle, process_single_pv_fn_t process_single_pv) { @@ -4216,21 +4223,42 @@ static int _process_pvs_in_vg(struct cmd_context *cmd, } process_pv = process_all_pvs; + dil = NULL; /* Remove each arg_devices entry as it is processed. */ - if (!process_pv && !dm_list_empty(arg_devices) && - (dil = _device_list_find_dev(arg_devices, pv->dev))) { - process_pv = 1; - _device_list_remove(arg_devices, dil->dev); + if (arg_devices && !dm_list_empty(arg_devices)) { + if ((dil = _device_list_find_dev(arg_devices, pv->dev))) + _device_list_remove(arg_devices, dil->dev); } + if (!process_pv && dil) + process_pv = 1; + if (!process_pv && !dm_list_empty(arg_tags) && str_list_match_list(arg_tags, &pv->tags, NULL)) process_pv = 1; process_pv = process_pv && select_match_pv(cmd, handle, vg, pv) && _select_matches(handle); + /* + * The command has asked to process a specific PV + * named on the command line, but the VG containing + * that PV cannot be accessed. In this case report + * and return an error. If the inaccessible PV is + * not explicitly named on the command line, it is + * silently skipped. + */ + if (process_pv && skip && dil && error_flags) { + if (error_flags & FAILED_EXPORTED) + log_error("Cannot use PV %s in exported VG %s.", pv_name, vg->name); + if (error_flags & FAILED_SYSTEMID) + log_error("Cannot use PV %s in foreign VG %s.", pv_name, vg->name); + if (error_flags & (FAILED_LOCK_TYPE | FAILED_LOCK_MODE)) + log_error("Cannot use PV %s in shared VG %s.", pv_name, vg->name); + ret_max = ECMD_FAILED; + } + if (process_pv) { if (skip) log_verbose("Skipping PV %s in VG %s.", pv_name, vg->name); @@ -4352,6 +4380,8 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags, log_debug("Processing PVs in VG %s", vg_name); + error_flags = 0; + vg = vg_read(cmd, vg_name, vg_uuid, read_flags, lockd_state, &error_flags, &error_vg); if (_ignore_vg(cmd, error_flags, error_vg, vg_name, NULL, read_flags, &skip, &notfound)) { stack; @@ -4359,7 +4389,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags, report_log_ret_code(ret_max); if (!skip) goto endvg; - /* Drop through to eliminate a clustered VG's PVs from the devices list */ + /* Drop through to eliminate unmpermitted PVs from the devices list */ } if (notfound) goto endvg; @@ -4370,7 +4400,7 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t read_flags, */ ret = _process_pvs_in_vg(cmd, vg ? vg : error_vg, all_devices, arg_devices, arg_tags, - process_all_pvs, process_all_devices, skip, + process_all_pvs, process_all_devices, skip, error_flags, handle, process_single_pv); if (ret != ECMD_PROCESSED) stack; diff --git a/tools/tools.h b/tools/tools.h index 69132a5..b78c471 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -136,6 +136,8 @@ struct arg_value_group_list { #define CAN_USE_ONE_SCAN 0x00002000 /* Command can use hints file */ #define ALLOW_HINTS 0x00004000 +/* Command can access exported vg. */ +#define ALLOW_EXPORTED 0x00008000 void usage(const char *name); diff --git a/tools/vgchange.c b/tools/vgchange.c index aad6db3..479ddd6 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -630,13 +630,6 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name, { detachprofile_ARG, &_vgchange_profile }, }; - if (vg_is_exported(vg)) { - if (cmd->command->command_enum == vgchange_monitor_CMD) - return ECMD_PROCESSED; - log_error("Volume group \"%s\" is exported", vg_name); - return ECMD_FAILED; - } - /* * FIXME: DEFAULT_BACKGROUND_POLLING should be "unspecified". * If --poll is explicitly provided use it; otherwise polling @@ -984,11 +977,6 @@ static int _vgchange_locktype_single(struct cmd_context *cmd, const char *vg_nam struct volume_group *vg, struct processing_handle *handle) { - if (vg_is_exported(vg)) { - log_error("Volume group \"%s\" is exported", vg_name); - return ECMD_FAILED; - } - if (!archive(vg)) return_ECMD_FAILED; @@ -1147,11 +1135,14 @@ int vgchange_lock_start_stop_cmd(struct cmd_context *cmd, int argc, char **argv) /* Disable the lockd_gl in process_each_vg. */ cmd->lockd_gl_disable = 1; + } else { + /* If the VG was started when it was exported, allow it to be stopped. */ + cmd->include_exported_vgs = 1; } handle->custom_handle = &vp; - ret = process_each_vg(cmd, argc, argv, NULL, NULL, READ_ALLOW_EXPORTED, 0, handle, &_vgchange_lock_start_stop_single); + ret = process_each_vg(cmd, argc, argv, NULL, NULL, 0, 0, handle, &_vgchange_lock_start_stop_single); /* Wait for lock-start ops that were initiated in vgchange_lockstart. */ @@ -1180,11 +1171,6 @@ static int _vgchange_systemid_single(struct cmd_context *cmd, const char *vg_nam struct volume_group *vg, struct processing_handle *handle) { - if (vg_is_exported(vg)) { - log_error("Volume group \"%s\" is exported", vg_name); - return ECMD_FAILED; - } - if (!archive(vg)) return_ECMD_FAILED; diff --git a/tools/vgck.c b/tools/vgck.c index 90fc5a3..46ad594 100644 --- a/tools/vgck.c +++ b/tools/vgck.c @@ -71,9 +71,6 @@ static int vgck_single(struct cmd_context *cmd __attribute__((unused)), struct volume_group *vg, struct processing_handle *handle __attribute__((unused))) { - if (!vg_check_status(vg, EXPORTED_VG)) - return_ECMD_FAILED; - if (!vg_validate(vg)) return_ECMD_FAILED; diff --git a/tools/vgimport.c b/tools/vgimport.c index 26c6363..0d8b0f2 100644 --- a/tools/vgimport.c +++ b/tools/vgimport.c @@ -87,8 +87,6 @@ int vgimport(struct cmd_context *cmd, int argc, char **argv) cmd->handles_missing_pvs = 1; } - return process_each_vg(cmd, argc, argv, NULL, NULL, - READ_FOR_UPDATE | READ_ALLOW_EXPORTED, - 0, NULL, - &_vgimport_single); + return process_each_vg(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE, + 0, NULL, &_vgimport_single); } diff --git a/tools/vgimportclone.c b/tools/vgimportclone.c index a3af841..be01861 100644 --- a/tools/vgimportclone.c +++ b/tools/vgimportclone.c @@ -235,7 +235,7 @@ int vgimportclone(struct cmd_context *cmd, int argc, char **argv) log_debug("Finding devices to import."); cmd->cname->flags |= ENABLE_DUPLICATE_DEVS; - process_each_pv(cmd, argc, argv, NULL, 0, READ_ALLOW_EXPORTED, handle, _vgimportclone_pv_single); + process_each_pv(cmd, argc, argv, NULL, 0, 0, handle, _vgimportclone_pv_single); if (vp.found_args != argc) { log_error("Failed to find all devices."); @@ -342,7 +342,7 @@ retry_name: clear_hint_file(cmd); - ret = process_each_vg(cmd, 0, NULL, vp.old_vgname, NULL, READ_FOR_UPDATE | READ_ALLOW_EXPORTED, 0, handle, _vgimportclone_vg_single); + ret = process_each_vg(cmd, 0, NULL, vp.old_vgname, NULL, READ_FOR_UPDATE, 0, handle, _vgimportclone_vg_single); unlock_vg(cmd, NULL, vp.new_vgname); out: diff --git a/tools/vgreduce.c b/tools/vgreduce.c index bc1f5b6..b001ccb 100644 --- a/tools/vgreduce.c +++ b/tools/vgreduce.c @@ -135,7 +135,7 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, { int r; - if (!vg_check_status(vg, EXPORTED_VG | LVM_WRITE | RESIZEABLE_VG)) + if (!vg_check_status(vg, LVM_WRITE | RESIZEABLE_VG)) return ECMD_FAILED; r = vgreduce_single(cmd, vg, pv, 1); @@ -250,8 +250,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv) init_ignore_suspended_devices(1); - process_each_vg(cmd, 0, NULL, vg_name, NULL, - READ_FOR_UPDATE | READ_ALLOW_EXPORTED, + process_each_vg(cmd, 0, NULL, vg_name, NULL, READ_FOR_UPDATE, 0, handle, &_vgreduce_repair_single); if (vp.already_consistent) { diff --git a/tools/vgremove.c b/tools/vgremove.c index 23640f6..8f73297 100644 --- a/tools/vgremove.c +++ b/tools/vgremove.c @@ -42,9 +42,6 @@ static int _vgremove_single(struct cmd_context *cmd, const char *vg_name, unsigned lv_count, missing; int ret; - if (!vg_check_status(vg, EXPORTED_VG)) - return_ECMD_FAILED; - lv_count = vg_visible_lvs(vg); if (lv_count) { diff --git a/tools/vgrename.c b/tools/vgrename.c index 4735e8b..8b76d0b 100644 --- a/tools/vgrename.c +++ b/tools/vgrename.c @@ -233,8 +233,7 @@ int vgrename(struct cmd_context *cmd, int argc, char **argv) handle->custom_handle = &vp; - ret = process_each_vg(cmd, 0, NULL, vg_name_old, NULL, - READ_FOR_UPDATE | READ_ALLOW_EXPORTED, + ret = process_each_vg(cmd, 0, NULL, vg_name_old, NULL, READ_FOR_UPDATE, 0, handle, _vgrename_single); /* Needed if process_each_vg returns error before calling _single. */ diff --git a/tools/vgsplit.c b/tools/vgsplit.c index 61cb13b..1bcc308 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -665,8 +665,16 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) if (!test_mode()) { unlock_vg(cmd, NULL, vg_name_to); release_vg(vg_to); - vg_to = vg_read_for_update(cmd, vg_name_to, NULL, - READ_ALLOW_EXPORTED, 0); + + /* + * This command uses the exported vg flag internally, but + * exported VGs are not allowed to be split from the command + * level, so ALLOW_EXPORTED is not set in commands.h. + */ + cmd->include_exported_vgs = 1; + + vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0, 0); + if (vg_read_error(vg_to)) { log_error("Volume group \"%s\" became inconsistent: " "please fix manually", vg_name_to);

1 0

stable-2.02 - cov: remove unused headers
by Zdenek Kabelac 25 Jun '19

25 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b62c0787debeb3a66a2e3… Commit: b62c0787debeb3a66a2e3658d1edb8a61a6f247b Parent: ff2bf113604882a0f21f118a5bb16076399bb67a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 25 15:19:07 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Jun 25 17:34:56 2019 +0200 cov: remove unused headers --- lib/device/bcache.c | 1 - lib/device/dev-io.c | 1 - lib/device/dev-type.c | 1 - lib/format_text/archiver.c | 1 - lib/format_text/format-text.c | 1 - lib/label/label.c | 1 - lib/metadata/vg.c | 1 - lib/misc/lvm-file.c | 1 - tools/lvmcmdline.c | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/lib/device/bcache.c b/lib/device/bcache.c index ccf0046..261164e 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -29,7 +29,6 @@ #include <libaio.h> #include <unistd.h> #include <linux/fs.h> -#include <sys/ioctl.h> #include <sys/user.h> #define SECTOR_SHIFT 9L diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 4590232..99ff803 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -17,7 +17,6 @@ #include "device.h" #include "metadata.h" #include "memlock.h" -#include "locking.h" #include <limits.h> #include <sys/stat.h> diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index ce4a05b..14a28dc 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -17,7 +17,6 @@ #include "xlate.h" #include "config.h" #include "metadata.h" -#include "bcache.h" #include "label.h" #include <libgen.h> diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index c8aeb47..467968a 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -18,7 +18,6 @@ #include "format-text.h" #include "lvm-string.h" #include "lvmcache.h" -#include "lvmetad.h" #include "memlock.h" #include "toolcontext.h" #include "locking.h" diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index a09c349..f39051c 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -29,7 +29,6 @@ #include "label.h" #include "lvmcache.h" #include "lvmetad.h" -#include "memlock.h" #include <unistd.h> #include <sys/param.h> diff --git a/lib/label/label.c b/lib/label/label.c index 83b4d99..d6212b1 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -26,7 +26,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include <sys/time.h> int use_full_md_check; diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index b8b1501..42801b9 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -18,7 +18,6 @@ #include "display.h" #include "activate.h" #include "toolcontext.h" -#include "lvmcache.h" #include "archiver.h" #include "lvmetad.h" diff --git a/lib/misc/lvm-file.c b/lib/misc/lvm-file.c index 36caaa7..7b789e5 100644 --- a/lib/misc/lvm-file.c +++ b/lib/misc/lvm-file.c @@ -14,7 +14,6 @@ */ #include "lib.h" -#include "lvm-file.h" #include <unistd.h> #include <sys/stat.h> diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index a9c3e41..0840c65 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -19,7 +19,6 @@ #include "label.h" #include "lvm-version.h" #include "lvmlockd.h" -#include "lvmetad-client.h" #include "stub.h" #include "last-path-component.h"

1 0

stable-2.02 - cov: ensure cname exists before derefering it
by Zdenek Kabelac 25 Jun '19

25 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ff2bf113604882a0f21f1… Commit: ff2bf113604882a0f21f118a5bb16076399bb67a Parent: 7232458b6c114cc83b471f08abc49fd1673831c4 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 25 15:29:26 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Jun 25 17:34:18 2019 +0200 cov: ensure cname exists before derefering it Just make it clear to analyzers cname can't be NULL. TODO: maybe exclude NULL at front of the function... --- tools/command.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/command.c b/tools/command.c index 377d03f..5237532 100644 --- a/tools/command.c +++ b/tools/command.c @@ -1916,7 +1916,7 @@ void print_usage(struct command *cmd, int longhelp, int desc_first) * see print_common_options_cmd() */ - if ((cname->variants > 1) && cname->common_options[opt_enum]) + if (cname && (cname->variants > 1) && cname->common_options[opt_enum]) continue; printf("\n\t["); @@ -1956,7 +1956,7 @@ void print_usage(struct command *cmd, int longhelp, int desc_first) * see print_common_options_cmd() */ - if ((cname->variants > 1) && cname->common_options[opt_enum]) + if (cname && (cname->variants > 1) && cname->common_options[opt_enum]) continue; printf("\n\t["); @@ -3384,7 +3384,7 @@ static int _print_man(char *name, char *des_file, int secondary) if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) { printf(".SH NAME\n"); - if (cname->desc) + if (cname && cname->desc) printf("%s - %s\n", lvmname, cname->desc); else printf("%s\n", lvmname);

1 0

stable-2.02 - cov: validate pagesize is not negative
by Zdenek Kabelac 25 Jun '19

25 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7232458b6c114cc83b471… Commit: 7232458b6c114cc83b471f08abc49fd1673831c4 Parent: 8bea252a636ff0de2266c1ce760b3a6047f0ff2f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 25 15:21:46 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Jun 25 17:33:47 2019 +0200 cov: validate pagesize is not negative As _init_free_list() cannot accept negative numbers --- lib/device/bcache.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/device/bcache.c b/lib/device/bcache.c index dac8be6..ccf0046 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -1040,6 +1040,11 @@ struct bcache *bcache_create(sector_t block_sectors, unsigned nr_cache_blocks, unsigned max_io = engine->max_io(engine); long pgsize = sysconf(_SC_PAGESIZE); + if ((pgsize = sysconf(_SC_PAGESIZE)) < 0) { + log_warn("bcache cannot read pagesize."); + return NULL; + } + if (!nr_cache_blocks) { log_warn("bcache must have at least one cache block"); return NULL;

1 0

stable-2.02 - cov: clearer condition check
by Zdenek Kabelac 25 Jun '19

25 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8bea252a636ff0de2266c… Commit: 8bea252a636ff0de2266c1ce760b3a6047f0ff2f Parent: 66665f5e428c2b3d7f4dbcd3e88a872db0381b93 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 25 15:08:10 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Jun 25 17:33:47 2019 +0200 cov: clearer condition check Make the code more obvious. --- lib/activate/activate.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index b3b8a25..561a965 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2478,7 +2478,12 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, * If vg_commit() did not happen, lvmcache_get_saved_vg_latest * returns the old metadata which we use to resume LVs. */ - if (!lv && lvid_s) { + if (!lv) { + if (!lvid_s) { + log_error(INTERNAL_ERROR "Requested resume of unindentified resource!"); + return 0; + } + lvid = (const union lvid *) lvid_s; vgid = (const char *)lvid->id[0].uuid;

1 0

stable-2.02 - cov: add stack tracing for error paths
by Zdenek Kabelac 25 Jun '19

25 Jun '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=66665f5e428c2b3d7f4db… Commit: 66665f5e428c2b3d7f4dbcd3e88a872db0381b93 Parent: 5cf1c61152bfd5f1eef7f49509a877090f4cc26f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 25 14:42:16 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Jun 25 17:33:25 2019 +0200 cov: add stack tracing for error paths Add missing stack reports on error paths. --- lib/cache/lvmcache.c | 3 ++- lib/device/bcache.c | 3 ++- lib/device/dev-cache.c | 3 ++- lib/device/dev-io.c | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 0ce5df0..9890325 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -2595,7 +2595,8 @@ void lvmcache_destroy(struct cmd_context *cmd, int retain_orphans, int reset) if (retain_orphans) { struct format_type *fmt; - lvmcache_init(cmd); + if (!lvmcache_init(cmd)) + stack; dm_list_iterate_items(fmt, &cmd->formats) { if (!lvmcache_add_orphan_vginfo(fmt->orphan_vg_name, fmt)) diff --git a/lib/device/bcache.c b/lib/device/bcache.c index f64931f..dac8be6 100644 --- a/lib/device/bcache.c +++ b/lib/device/bcache.c @@ -1101,7 +1101,8 @@ void bcache_destroy(struct bcache *cache) if (cache->nr_locked) log_warn("some blocks are still locked"); - bcache_flush(cache); + if (!bcache_flush(cache)) + log_warn("cache flushing failed."); _wait_all(cache); _exit_free_list(cache); _hash_table_exit(cache); diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 04ee41e..a429b10 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -1344,7 +1344,8 @@ static int _check_for_open_devices(int close_immediate) dev_name(dev), dev->open_count); num_open++; if (close_immediate) - dev_close_immediate(dev); + if (!dev_close_immediate(dev)) + stack; } } diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c index 6996a44..4590232 100644 --- a/lib/device/dev-io.c +++ b/lib/device/dev-io.c @@ -521,7 +521,8 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet) /* dev_close_immediate will decrement this */ dev->open_count++; - dev_close_immediate(dev); + if (!dev_close_immediate(dev)) + stack; // FIXME: dev with DEV_ALLOCED is released // but code is referencing it } @@ -599,7 +600,8 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet) if (!(dev->flags & DEV_REGULAR) && ((fstat(dev->fd, &buf) < 0) || (buf.st_rdev != dev->dev))) { log_error("%s: fstat failed: Has device name changed?", name); - dev_close_immediate(dev); + if (!dev_close_immediate(dev)) + stack; return 0; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits June 2019