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

pvscan: use format feature flags in lvmetad code

Browse Source 
Introduce FMT_OBSOLETE to identify pool metadata and use it and FMT_MDAS
instead of hard-coded format names.
Explain device accesses on pvscan --cache man page.
This commit is contained in:
Alasdair G Kergon 2014-01-08 02:13:13 +00:00
parent 21c3b41ea8
commit 0a13815e68
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/cache/lvmetad.c vendored
View File

@ -20,8 +20,6 @@
#include "lvmcache.h" #include "lvmcache.h"
#include "lvmetad-client.h" #include "lvmetad-client.h"
#include "format-text.h" // TODO for disk_locn, used as a DA representation #include "format-text.h" // TODO for disk_locn, used as a DA representation
#include "format_pool.h" // for FMT_POOL_NAME
#include "format1.h" // for FMT_LVM1_NAME
#include "crc.h" #include "crc.h"
static daemon_handle _lvmetad; static daemon_handle _lvmetad;
@ -901,25 +899,28 @@ int lvmetad_pvscan_single(struct cmd_context *cmd, struct device *dev,
info = (struct lvmcache_info *) label->info; info = (struct lvmcache_info *) label->info;
baton.vg = NULL; baton.vg = NULL;
baton.fid = lvmcache_fmt(info)->ops->create_instance(lvmcache_fmt(info), baton.fid = lvmcache_fmt(info)->ops->create_instance(lvmcache_fmt(info), &fic);
&fic);
if (!baton.fid) if (!baton.fid)
goto_bad; goto_bad;
lvmcache_foreach_mda(info, _lvmetad_pvscan_single, &baton); if (baton.fid->fmt->features & FMT_OBSOLETE) {
log_error("WARNING: Ignoring obsolete format of metadata (%s) on device %s when using lvmetad",
if (lvmcache_fmt(info) == get_format_by_name(cmd, FMT_POOL_NAME)) { baton.fid->fmt->name, dev_name(dev));
log_error("WARNING: Ignoring old GFS pool metadata on device %s "
"when using lvmetad", dev_name(dev));
lvmcache_fmt(info)->ops->destroy_instance(baton.fid); lvmcache_fmt(info)->ops->destroy_instance(baton.fid);
return 0; return 0;
} }
/* LVM1 VGs have no MDAs. */ lvmcache_foreach_mda(info, _lvmetad_pvscan_single, &baton);
if (!baton.vg && lvmcache_fmt(info) == get_format_by_name(cmd, FMT_LVM1_NAME))
baton.vg = ((struct metadata_area *) dm_list_first(&baton.fid->metadata_areas_in_use))-> /*
ops->vg_read(baton.fid, lvmcache_vgname_from_info(info), NULL, 0); * LVM1 VGs have no MDAs and lvmcache_foreach_mda isn't worth fixing
* to use pseudo-mdas for PVs.
* Note that the single_device parameter also gets ignored and this code
* can scan further devices.
*/
if (!baton.vg && !(baton.fid->fmt->features & FMT_MDAS))
baton.vg = ((struct metadata_area *) dm_list_first(&baton.fid->metadata_areas_in_use))->ops->vg_read(baton.fid, lvmcache_vgname_from_info(info), NULL, 1);
if (!baton.vg) if (!baton.vg)
lvmcache_fmt(info)->ops->destroy_instance(baton.fid); lvmcache_fmt(info)->ops->destroy_instance(baton.fid);

2
lib/format_pool/format_pool.c
View File

@ -298,7 +298,7 @@ struct format_type *init_format(struct cmd_context *cmd)
fmt->name = FMT_POOL_NAME; fmt->name = FMT_POOL_NAME;
fmt->alias = NULL; fmt->alias = NULL;
fmt->orphan_vg_name = FMT_POOL_ORPHAN_VG_NAME; fmt->orphan_vg_name = FMT_POOL_ORPHAN_VG_NAME;
fmt->features = 0; fmt->features = FMT_OBSOLETE;
fmt->private = NULL; fmt->private = NULL;
dm_list_init(&fmt->mda_ops); dm_list_init(&fmt->mda_ops);

1
lib/metadata/metadata-exported.h
View File

@ -122,6 +122,7 @@
#define FMT_RESTRICTED_READAHEAD 0x00000200U /* Readahead restricted to 2-120? */ #define FMT_RESTRICTED_READAHEAD 0x00000200U /* Readahead restricted to 2-120? */
#define FMT_BAS 0x000000400U /* Supports bootloader areas? */ #define FMT_BAS 0x000000400U /* Supports bootloader areas? */
#define FMT_CONFIG_PROFILE 0x000000800U /* Supports configuration profiles? */ #define FMT_CONFIG_PROFILE 0x000000800U /* Supports configuration profiles? */
#define FMT_OBSOLETE 0x000001000U /* Obsolete format? */
/* Mirror conversion type flags */ /* Mirror conversion type flags */
#define MIRROR_BY_SEG 0x00000001U /* segment-by-segment mirror */ #define MIRROR_BY_SEG 0x00000001U /* segment-by-segment mirror */

9
man/pvscan.8.in
View File

@ -57,13 +57,20 @@ supported for logical volumes that are part of partial or clustered volume group
.BR \-b ", " \-\-background .BR \-b ", " \-\-background
Run the command in the background. Run the command in the background.
.TP .TP
.BR \-\-cache " [" \-\-major " " \fImajor " " \-\-minor " " \fIminor " | " \fIDevicePath " ]..." .BR \-\-cache " [" \-\-major " " \fImajor " " \-\-minor " " \fIminor " | " \fIDevicePath " | " \fImajor:minor " ]..."
Scan one or more devices and instruct the lvmetad daemon to update its cached Scan one or more devices and instruct the lvmetad daemon to update its cached
state accordingly. Called internally by udev rules. state accordingly. Called internally by udev rules.
All devices listed explicitly are processed \fBregardless\fP of any device All devices listed explicitly are processed \fBregardless\fP of any device
filters set using \fBdevices/filter\fP configuration setting. To filter filters set using \fBdevices/filter\fP configuration setting. To filter
devices even in this case, the \fBdevices/global_filter\fP must be used. devices even in this case, the \fBdevices/global_filter\fP must be used.
If lvmetad has not yet cached any metadata or the filters have recently been
changed, then all devices may be scanned, effectively ignoring the rest of
the command line. Otherwise, if all the devices referenced on the command line
contain metadata in the default lvm2 format, other devices are not accessed.
If metadata written using the obsolete GFS pool format is encountered, this is
ignored and so lvmetad should not be used.
.SH SEE ALSO .SH SEE ALSO
.BR lvm (8), .BR lvm (8),
.BR lvmetad (8),
.BR pvcreate (8), .BR pvcreate (8),
.BR pvdisplay (8) .BR pvdisplay (8)