shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

pvscan: Respect lvmetad (global) filter in --cache w/ a device.

Browse Source
This commit is contained in:
Petr Rockai 2013-07-22 15:03:56 +02:00
parent ea333a894e
commit 3fdb45d040
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/shell/lvmetad-pvscan-filter.sh Normal file
View File

@ -0,0 +1,29 @@
#!/bin/sh
# Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
. lib/test
test -e LOCAL_LVMETAD || skip
aux prepare_pvs 2
maj=$(($(stat --printf=0x%t "$dev2")))
min=$(($(stat --printf=0x%T "$dev2")))
aux hide_dev $dev2
not pvscan --cache $dev2 2>&1 | grep "not found"
# pvscan with --major/--minor does not fail (for udev's sake?)
pvscan --cache --major $maj --minor $min 2>&1 | grep "not found"
aux unhide_dev $dev2
pvscan --cache $dev2 2>&1 | not grep "not found"
pvscan --cache --major $maj --minor $min 2>&1 | not grep "not found"
pvs | grep $dev2

5
tools/pvscan.c
View File

@ -187,7 +187,7 @@ static int _pvscan_lvmetad(struct cmd_context *cmd, int argc, char **argv)
/* Process any command line PVs first. */ /* Process any command line PVs first. */
while (argc--) { while (argc--) {
pv_name = *argv++; pv_name = *argv++;
dev = dev_cache_get(pv_name, NULL); dev = dev_cache_get(pv_name, cmd->lvmetad_filter);
if (!dev) { if (!dev) {
log_error("Physical Volume %s not found.", pv_name); log_error("Physical Volume %s not found.", pv_name);
ret = ECMD_FAILED; ret = ECMD_FAILED;
@ -218,10 +218,9 @@ static int _pvscan_lvmetad(struct cmd_context *cmd, int argc, char **argv)
devno = MKDEV((dev_t)major, minor); devno = MKDEV((dev_t)major, minor);
if (!(dev = dev_cache_get_by_devt(devno, NULL))) { if (!(dev = dev_cache_get_by_devt(devno, cmd->lvmetad_filter))) {
if (!dm_asprintf(&buf, "%" PRIi32 ":%" PRIi32, major, minor)) if (!dm_asprintf(&buf, "%" PRIi32 ":%" PRIi32, major, minor))
stack; stack;
/* FIXME Filters? */
if (!lvmetad_pv_gone(devno, buf ? : "", handler)) { if (!lvmetad_pv_gone(devno, buf ? : "", handler)) {
ret = ECMD_FAILED; ret = ECMD_FAILED;
if (buf) if (buf)