lvm2-commits February 2016

lvm2-commits@lists.fedorahosted.org

8 participants
174 discussions

master - toollib: skip PV if system ID is used and PV marked as used but metadata missing
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cc9e683adcb6c563… Commit: cc9e683adcb6c56332d708baf02dec63eba4fba9 Parent: 0000db7f98a07aa31c5b1cf13938b612e7f2821b Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Feb 15 15:11:54 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 15:17:36 2016 +0100 toollib: skip PV if system ID is used and PV marked as used but metadata missing If we know that a PV belongs to some VG and we're missing metadata (because we have only those PV(s) from VG present in the system that don't have metadata areas), we should skip such PV when processing under system ID. This is because we know that the PV belongs to some VG, but we really can't decide whether it matches system ID unless the VG metadata is present again. --- WHATS_NEW | 1 + tools/toollib.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 47eb735..48f2fb3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.143 - ===================================== + If PV belongs to some VG and metadata missing, skip it if system ID is used. Automatically change PV header extension to latest version if writing PV/VG. Identify used PVs in pv_attr field by new 'u' character. Add pv_in_use reporting field to report if PV is used or not. diff --git a/tools/toollib.c b/tools/toollib.c index 7f8c2eb..1bdc113 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -3067,6 +3067,12 @@ static int _process_pvs_in_vg(struct cmd_context *cmd, pv = pvl->pv; pv_name = pv_dev_name(pv); + if (cmd->system_id && is_orphan(pv) && is_used_pv(pv)) { + log_verbose("PV %s is belonging to a VG but its metadata is missing.", pv_name); + log_verbose("Skipping PV %s because it's not possible to decide whether it matches system id.", pv_name); + continue; + } + process_pv = process_all_pvs; /* Remove each arg_devices entry as it is processed. */

1 0

master - pv: mark fake PVs as not used
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0000db7f98a07aa3… Commit: 0000db7f98a07aa31c5b1cf13938b612e7f2821b Parent: abbaeef096251c4191e6da2518e646dd78b82da8 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Feb 15 14:46:31 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 14:46:31 2016 +0100 pv: mark fake PVs as not used Some of the PVs are not even orphan PVs - they're fake PVs - this can happen if we're listing all devices with "pvs -a". Such PV must not be marked as used. --- lib/metadata/pv.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/metadata/pv.c b/lib/metadata/pv.c index 260eb9b..d5820b5 100644 --- a/lib/metadata/pv.c +++ b/lib/metadata/pv.c @@ -213,6 +213,9 @@ int is_used_pv(const struct physical_volume *pv) struct lvmcache_info *info; uint32_t ext_flags; + if (!pv->vg) + return 0; + if (!is_orphan(pv)) return 1;

1 0

master - cleanup: use is_used_pv fn to detect whether PV is in use while reporting pv_free field
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=abbaeef096251c41… Commit: abbaeef096251c4191e6da2518e646dd78b82da8 Parent: 698e0eb851b280796e3fbe17fbe9a9158b6344c7 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Feb 15 13:30:37 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 13:30:37 2016 +0100 cleanup: use is_used_pv fn to detect whether PV is in use while reporting pv_free field --- lib/report/report.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/report/report.c b/lib/report/report.c index c964bd8..123b9f0 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -2375,20 +2375,12 @@ static int _pvfree_disp(struct dm_report *rh, struct dm_pool *mem, { const struct physical_volume *pv = (const struct physical_volume *) data; - struct lvmcache_info *info; - uint32_t ext_flags; - uint64_t freespace = pv_free(pv); + uint64_t freespace; - if (is_orphan(pv)) { - if (!(info = lvmcache_info_from_pvid((const char *) &pv->id, 0))) { - log_error("Failed to find cached info for PV %s.", pv_dev_name(pv)); - return 0; - } - - ext_flags = lvmcache_ext_flags(info); - if (ext_flags & PV_EXT_USED) - freespace = 0; - } + if (is_orphan(pv) && is_used_pv(pv)) + freespace = 0; + else + freespace = pv_free(pv); return _size64_disp(rh, mem, field, &freespace, private); }

1 0

master - WHATS_NEW: PV_EXT_USED flag and related
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=698e0eb851b28079… Commit: 698e0eb851b280796e3fbe17fbe9a9158b6344c7 Parent: 8ad93874d63d67ea375b37b7014d782476dab88d Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Feb 15 13:07:35 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 13:07:35 2016 +0100 WHATS_NEW: PV_EXT_USED flag and related --- WHATS_NEW | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index c7ffcf7..47eb735 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,10 @@ Version 2.02.143 - ===================================== + Automatically change PV header extension to latest version if writing PV/VG. + Identify used PVs in pv_attr field by new 'u' character. + Add pv_in_use reporting field to report if PV is used or not. + Add pv_ext_vsn reporting field to report PV header extension version. + Add protective flag marking PVs as used even if no metadata available. Version 2.02.142 - 15th February 2016 =====================================

1 0

master - tests: fix tests checking pv_attr - there's a new bit now
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8ad93874d63d67ea… Commit: 8ad93874d63d67ea375b37b7014d782476dab88d Parent: a4e25f4381284967467a1103d67e3cdbdd2cdf82 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Feb 12 12:05:59 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 12:44:46 2016 +0100 tests: fix tests checking pv_attr - there's a new bit now --- lib/format_text/format-text.c | 3 +++ test/shell/pvchange-usage.sh | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 666357c..72ca198 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1447,6 +1447,9 @@ static int _text_pv_needs_rewrite(const struct format_type *fmt, struct physical *needs_rewrite = 0; + if (!pv->is_labelled) + return 1; + if (!(info = lvmcache_info_from_pvid((const char *)&pv->id, 0))) { log_error("Failed to find cached info for PV %s.", pv_dev_name(pv)); return 0; diff --git a/test/shell/pvchange-usage.sh b/test/shell/pvchange-usage.sh index b6fbebd..ce44d84 100644 --- a/test/shell/pvchange-usage.sh +++ b/test/shell/pvchange-usage.sh @@ -23,11 +23,11 @@ aux prepare_pvs 4 # check 'allocatable' pv attribute pvcreate "$dev1" -check pv_field "$dev1" pv_attr --- +check pv_field "$dev1" pv_attr ---- vgcreate $vg1 "$dev1" -check pv_field "$dev1" pv_attr a-- +check pv_field "$dev1" pv_attr a--u pvchange --allocatable n "$dev1" -check pv_field "$dev1" pv_attr --- +check pv_field "$dev1" pv_attr ---u vgremove -ff $vg1 not pvchange --allocatable y "$dev1" pvremove -ff "$dev1" @@ -50,10 +50,10 @@ do # "vgchange disable/enable allocation for pvs with metadatacopies = $mda (bz452982)" pvchange "$dev1" -x n pvchange "$dev1" -x n # already disabled - check pv_field "$dev1" pv_attr --- + check pv_field "$dev1" pv_attr ---u pvchange "$dev1" -x y pvchange "$dev1" -x y # already enabled - check pv_field "$dev1" pv_attr a-- + check pv_field "$dev1" pv_attr a--u # check we are able to change number of managed metadata areas if test $mda -gt 0 ; then

1 0

master - tests: add pv-ext-flags.sh test
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a4e25f4381284967… Commit: a4e25f4381284967467a1103d67e3cdbdd2cdf82 Parent: 2f00d57e6f7e1066448f93af0b67a378da29a4d0 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Apr 7 13:50:54 2015 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 12:44:46 2016 +0100 tests: add pv-ext-flags.sh test Testing PV extension flags. Currently, there's only one PV extension flag present - the PV_EXT_USED flag (marking PV as used in a VG). --- test/shell/pv-ext-flags.sh | 163 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) diff --git a/test/shell/pv-ext-flags.sh b/test/shell/pv-ext-flags.sh new file mode 100644 index 0000000..072ec2c --- /dev/null +++ b/test/shell/pv-ext-flags.sh @@ -0,0 +1,163 @@ +#!/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_LVMPOLLD=1 + +. lib/inittest + +aux prepare_devs 2 + +# PV_EXT_USED flag +MARKED_AS_USED_MSG="marked as belonging to a VG but its metadata is missing" + +###################################### +### CHECK PV WITH 0 METADATA AREAS ### +###################################### + +pvcreate -ff -y --metadatacopies 0 "$dev1" +pvcreate -ff -y --metadatacopies 1 "$dev2" + +# $dev1 and $dev2 not in any VG - pv_in_use field should be blank +check pv_field "$dev1" pv_in_use "" +check pv_field "$dev2" pv_in_use "" + +# $dev1 and $dev now in a VG - pv_in_use should display "used" +vgcreate $vg1 "$dev1" "$dev2" +check pv_field "$dev1" pv_in_use "used" +check pv_field "$dev2" pv_in_use "used" + +# disable $dev2 and dev1 with 0 MDAs remains, but still +# marked as used, so pvcreate/vgcreate/pvremove should fail +aux disable_dev "$dev2" +pvscan --cache + +check pv_field "$dev1" pv_in_use "used" +not pvcreate "$dev1" 2>err +cat err +grep "$MARKED_AS_USED_MSG" err +not pvchange -u "$dev1" 2>err +grep "$MARKED_AS_USED_MSG" err +not vgcreate $vg2 "$dev1" 2>err +grep "$MARKED_AS_USED" err +not pvremove "$dev1" 2>err +grep "$MARKED_AS_USED_MSG" err + +# save PV signature from dev1 for reuse later on in this +# test so we don't need to initialize all the VG stuff again +dd if="$dev1" of=dev1_backup bs=1M + +# pvcreate and pvremove can be forced even if the PV is marked as used +pvremove -ff "$dev1" +dd if=dev1_backup of="$dev1" bs=1M +pvcreate -ff "$dev1" +dd if=dev1_backup of="$dev1" bs=1M + +# prepare a VG with $dev1 and $dev both having 1 MDA +aux enable_dev "$dev2" +vgremove -ff $vg1 +pvcreate --metadatacopies 1 "$dev1" +vgcreate $vg1 "$dev1" "$dev2" + +# disable $dev1, then repair the VG - $dev1 is removed from VG +aux disable_dev "$dev1" +vgreduce --removemissing $vg1 +# now, enable $dev1, automatic repair will happen on pvs call +# (or any other lvm command that does vg_read with repair inside) +aux enable_dev "$dev1" + +# FIXME: once persistent cache does not cause races with timestamps +# causing LVM tools to not see the VG inconsistency and once +# VG repair is always done, delete this line which removes +# persistent .cache as a workaround +rm -f $TESTDIR/etc/.cache + +vgck $vg1 +# check $dev1 does not contain the PV_EXT_FLAG anymore - it +# should be removed as part of the repaid during vg_read since +# $dev1 is not part of $vg1 anymore +check pv_field "$dev1" pv_in_use "" + +############################################# +### CHECK PV WITH DISABLED METADATA AREAS ### +############################################# + +pvcreate -ff -y --metadatacopies 1 "$dev1" +pvcreate -ff -y --metadatacopies 1 "$dev2" + +# $dev1 and $dev2 not in any VG - pv_in_use field should be blank +check pv_field "$dev1" pv_in_use "" +check pv_field "$dev2" pv_in_use "" + +# $dev1 and $dev now in a VG - pv_in_use should display "used" +vgcreate $vg1 "$dev1" "$dev2" +check pv_field "$dev1" pv_in_use "used" +check pv_field "$dev2" pv_in_use "used" + +pvchange --metadataignore y "$dev1" +aux disable_dev "$dev2" +pvscan --cache + +check pv_field "$dev1" pv_in_use "used" +not pvcreate "$dev1" 2>err +grep "$MARKED_AS_USED_MSG" err +not pvchange -u "$dev1" 2>err +grep "$MARKED_AS_USED_MSG" err +not vgcreate $vg2 "$dev1" 2>err +grep "$MARKED_AS_USED" err +not pvremove "$dev1" 2>err +grep "$MARKED_AS_USED_MSG" err + +# save PV signature from dev1 for reuse later on in this +# test so we don't need to initialize all the VG stuff again +dd if="$dev1" of=dev1_backup bs=1M + +# pvcreate and pvremove can be forced even if the PV is marked as used +pvremove -ff "$dev1" +dd if=dev1_backup of="$dev1" bs=1M +pvcreate -ff "$dev1" +dd if=dev1_backup of="$dev1" bs=1M + +# prepare a VG with $dev1 and $dev both having 1 MDA +aux enable_dev "$dev2" +vgremove -ff $vg1 +pvcreate --metadatacopies 1 "$dev1" +vgcreate $vg1 "$dev1" "$dev2" + +# disable $dev1, then repair the VG - $dev1 is removed from VG +aux disable_dev "$dev1" +vgreduce --removemissing $vg1 +# now, enable $dev1, automatic repair will happen on pvs call +# (or any other lvm command that does vg_read with repair inside) +aux enable_dev "$dev1" + +# FIXME: once persistent cache does not cause races with timestamps +# causing LVM tools to not see the VG inconsistency and once +# VG repair is always done, delete this line which removes +# persistent .cache as a workaround +rm -f $TESTDIR/etc/.cache + +vgck $vg1 +# check $dev1 does not contain the PV_EXT_FLAG anymore - it +# should be removed as part of the repaid during vg_read since +# $dev1 is not part of $vg1 anymore +check pv_field "$dev1" pv_in_use "" + +########################### +# OTHER PV-RELATED CHECKS # +########################### + +# vgcfgrestore should also set PV_EXT_FLAG on PVs where VG is restored +vgcfgbackup -f vg_backup $vg1 +check pv_field "$dev2" pv_in_use "used" +vgremove -ff $vg1 +check pv_field "$dev2" pv_in_use "" +vgcfgrestore -f vg_backup $vg1 +check pv_field "$dev2" pv_in_use "used"

1 0

master - vg: automatically update to newest PV ext version during vg_write
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2f00d57e6f7e1066… Commit: 2f00d57e6f7e1066448f93af0b67a378da29a4d0 Parent: 9b9f1ae7726c2ee0e7eda76cd519f7d4921a12d9 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Feb 12 14:22:02 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 12:44:46 2016 +0100 vg: automatically update to newest PV ext version during vg_write --- lib/metadata/metadata.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index a08cfc3..eb50c0a 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3073,6 +3073,59 @@ out: return r; } +static int _pv_in_pvs_to_write_list(struct physical_volume *pv, struct volume_group *vg) +{ + struct pv_to_write *pvw; + + dm_list_iterate_items(pvw, &vg->pvs_to_write) { + if (pvw->pv == pv) + return 1; + } + + return 0; +} + +/* + * Check if any of the PVs in VG still contain old PV headers + * and if yes, schedule them for PV header update. + */ +static int _check_old_pv_ext_for_vg(struct volume_group *vg) +{ + struct pv_list *pvl; + struct pv_to_write *pvw; + int pv_needs_rewrite; + + if (!(vg->fid->fmt->features & FMT_PV_FLAGS)) + return 1; + + dm_list_iterate_items(pvl, &vg->pvs) { + if (is_missing_pv(pvl->pv) || + !pvl->pv->fmt->ops->pv_needs_rewrite) + continue; + + if (!pvl->pv->fmt->ops->pv_needs_rewrite(pvl->pv->fmt, pvl->pv, + &pv_needs_rewrite)) + return_0; + + if (pv_needs_rewrite) { + /* + * Schedule PV for writing only once! + */ + if (_pv_in_pvs_to_write_list(pvl->pv, vg)) + continue; + + if (!(pvw = dm_pool_zalloc(vg->vgmem, sizeof(*pvw)))) { + log_error("pv_to_write allocation for '%s' failed", pv_dev_name(pvl->pv)); + return 0; + } + pvw->pv = pvl->pv; + dm_list_add(&vg->pvs_to_write, &pvw->list); + } + } + + return 1; +} + /* * After vg_write() returns success, * caller MUST call either vg_commit() or vg_revert() @@ -3123,6 +3176,11 @@ int vg_write(struct volume_group *vg) return 0; } + if (!(_check_old_pv_ext_for_vg(vg))) { + log_error("Failed to schedule physical volume header update."); + return 0; + } + if (!drop_cached_metadata(vg)) { log_error("Unable to drop cached metadata for VG %s.", vg->name); return 0;

1 0

master - format: format_text: add pv_needs_rewrite to format_handler and implemention for format_text
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9b9f1ae7726c2ee0… Commit: 9b9f1ae7726c2ee0e7eda76cd519f7d4921a12d9 Parent: 08de88535e4b06906507abf7ab79bf26be6469f8 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Feb 12 13:53:06 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 12:44:46 2016 +0100 format: format_text: add pv_needs_rewrite to format_handler and implemention for format_text --- lib/format_text/format-text.c | 22 ++++++++++++++++++++++ lib/metadata/metadata.h | 9 +++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 7202658..666357c 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1439,6 +1439,27 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume return 1; } +static int _text_pv_needs_rewrite(const struct format_type *fmt, struct physical_volume *pv, + int *needs_rewrite) +{ + struct lvmcache_info *info; + uint32_t ext_vsn; + + *needs_rewrite = 0; + + if (!(info = lvmcache_info_from_pvid((const char *)&pv->id, 0))) { + log_error("Failed to find cached info for PV %s.", pv_dev_name(pv)); + return 0; + } + + ext_vsn = lvmcache_ext_version(info); + + if (ext_vsn < PV_HEADER_EXTENSION_VSN) + *needs_rewrite = 1; + + return 1; +} + static int _add_raw(struct dm_list *raw_list, struct device_area *dev_area) { struct raw_list *rl; @@ -2384,6 +2405,7 @@ static struct format_handler _text_handler = { .pv_remove_metadata_area = _text_pv_remove_metadata_area, .pv_resize = _text_pv_resize, .pv_write = _text_pv_write, + .pv_needs_rewrite = _text_pv_needs_rewrite, .vg_setup = _text_vg_setup, .lv_setup = _text_lv_setup, .create_instance = _text_create_text_instance, diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 3f5f5ae..f2b62e4 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -303,6 +303,15 @@ struct format_handler { struct physical_volume * pv); /* + * Check if PV needs rewriting. This is used to check whether there are any + * format-specific changes before actually writing the PV (by calling pv_write). + * With this, we can call pv_write conditionally only if it's really needed. + */ + int (*pv_needs_rewrite) (const struct format_type *fmt, + struct physical_volume *pv, + int *needs_rewrite); + + /* * Tweak an already filled out a lv eg, check there * aren't too many extents. */

1 0

master - report: identify used PVs in pv_attr field with 'u' char
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=08de88535e4b0690… Commit: 08de88535e4b06906507abf7ab79bf26be6469f8 Parent: db494d7d344f323c7255d6ceb9cd5180e4b6f23b Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Feb 11 15:34:05 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 12:44:46 2016 +0100 report: identify used PVs in pv_attr field with 'u' char --- lib/metadata/pv.c | 4 +++- man/pvs.8.in | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/metadata/pv.c b/lib/metadata/pv.c index 7ea7d2b..260eb9b 100644 --- a/lib/metadata/pv.c +++ b/lib/metadata/pv.c @@ -232,8 +232,9 @@ int is_used_pv(const struct physical_volume *pv) char *pv_attr_dup(struct dm_pool *mem, const struct physical_volume *pv) { char *repstr; + int used = is_used_pv(pv); - if (!(repstr = dm_pool_zalloc(mem, 4))) { + if (!(repstr = dm_pool_zalloc(mem, 5))) { log_error("dm_pool_alloc failed"); return NULL; } @@ -241,6 +242,7 @@ char *pv_attr_dup(struct dm_pool *mem, const struct physical_volume *pv) repstr[0] = (pv->status & ALLOCATABLE_PV) ? 'a' : '-'; repstr[1] = (pv->status & EXPORTED_VG) ? 'x' : '-'; repstr[2] = (pv->status & MISSING_PV) ? 'm' : '-'; + repstr[3] = used <= 0 ? '-' : 'u'; return repstr; } diff --git a/man/pvs.8.in b/man/pvs.8.in index efafbde..4bc042b 100644 --- a/man/pvs.8.in +++ b/man/pvs.8.in @@ -85,7 +85,8 @@ pv_mda_used_count, pvseg_start, and pvseg_size .IP With \fB\-\-segments\fP, any "pvseg_" prefixes are optional; otherwise any "pv_" prefixes are optional. Columns mentioned in \fBvgs\fP(8) can also -be chosen. The pv_attr bits are: (a)llocatable, e(x)ported and (m)issing. +be chosen. The pv_attr bits are: (a)llocatable, e(x)ported, (m)issing and +(u)sed. .TP .B \-\-segments Produces one line of output for each contiguous allocation of space on each

1 0

master - report: always display 0 for pv_free field if we don't have any mda and PV is marked as used at the same time
by Peter Rajnoha 15 Feb '16

15 Feb '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=db494d7d344f323c… Commit: db494d7d344f323c7255d6ceb9cd5180e4b6f23b Parent: d84a80afb5e65420fdca3c283754a90e5b0bacaa Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Feb 11 15:00:43 2016 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Feb 15 12:44:46 2016 +0100 report: always display 0 for pv_free field if we don't have any mda and PV is marked as used at the same time --- lib/report/report.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/lib/report/report.c b/lib/report/report.c index 3f2bd0c..c964bd8 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -2363,6 +2363,7 @@ static int _pvused_disp(struct dm_report *rh, struct dm_pool *mem, { const struct physical_volume *pv = (const struct physical_volume *) data; + uint64_t used = pv_used(pv); return _size64_disp(rh, mem, field, &used, private); @@ -2374,8 +2375,21 @@ static int _pvfree_disp(struct dm_report *rh, struct dm_pool *mem, { const struct physical_volume *pv = (const struct physical_volume *) data; + struct lvmcache_info *info; + uint32_t ext_flags; uint64_t freespace = pv_free(pv); + if (is_orphan(pv)) { + if (!(info = lvmcache_info_from_pvid((const char *) &pv->id, 0))) { + log_error("Failed to find cached info for PV %s.", pv_dev_name(pv)); + return 0; + } + + ext_flags = lvmcache_ext_flags(info); + if (ext_flags & PV_EXT_USED) + freespace = 0; + } + return _size64_disp(rh, mem, field, &freespace, private); }

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
18
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits February 2016