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

Introduce VG_GLOBAL lock type for vgscan/pvscan to trigger clvmd -R.

Browse Source
This commit is contained in:
Alasdair Kergon 2007-08-23 15:02:26 +00:00
parent f608f30407
commit e935d21752
6 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.28 - Version 2.02.28 -
================================ ================================
Introduce VG_GLOBAL lock type for vgscan/pvscan to trigger clvmd -R.
Fix clvmd -R, so it fully refreshes the caches. Fix clvmd -R, so it fully refreshes the caches.
Change lvconvert_mirrors to use mirror segtype not striped. Change lvconvert_mirrors to use mirror segtype not striped.
Fix lvconvert_mirrors detection of number of existing mirrors. Fix lvconvert_mirrors detection of number of existing mirrors.

4
lib/locking/cluster_locking.c
View File

@ -382,8 +382,10 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)
switch (flags & LCK_SCOPE_MASK) { switch (flags & LCK_SCOPE_MASK) {
case LCK_VG: case LCK_VG:
/* If the VG name is empty then lock the unused PVs */ /* If the VG name is empty then lock the unused PVs */
if (!*resource) if (!*resource) /* FIXME Deprecated */
dm_snprintf(lockname, sizeof(lockname), "P_orphans"); dm_snprintf(lockname, sizeof(lockname), "P_orphans");
else if (*resource == '#')
dm_snprintf(lockname, sizeof(lockname), "P_%s", resource + 1);
else else
dm_snprintf(lockname, sizeof(lockname), "V_%s", dm_snprintf(lockname, sizeof(lockname), "V_%s",
resource); resource);

5
lib/locking/file_locking.c
View File

@ -212,9 +212,12 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource,
switch (flags & LCK_SCOPE_MASK) { switch (flags & LCK_SCOPE_MASK) {
case LCK_VG: case LCK_VG:
if (!*resource) if (!*resource) /* FIXME Deprecated */
dm_snprintf(lockfile, sizeof(lockfile), dm_snprintf(lockfile, sizeof(lockfile),
"%s/P_orphans", _lock_dir); "%s/P_orphans", _lock_dir);
else if (*resource == '#')
dm_snprintf(lockfile, sizeof(lockfile),
"%s/P_%s", _lock_dir, resource + 1);
else else
dm_snprintf(lockfile, sizeof(lockfile), dm_snprintf(lockfile, sizeof(lockfile),
"%s/V_%s", _lock_dir, resource); "%s/V_%s", _lock_dir, resource);

7
lib/locking/locking.h
View File

@ -28,7 +28,7 @@ int locking_is_clustered(void);
/* /*
* LCK_VG: * LCK_VG:
* Lock/unlock on-disk volume group data * Lock/unlock on-disk volume group data
* Use "" to lock orphan PVs * Use VG_ORPHANS to lock orphan PVs
* char *vol holds volume group name * char *vol holds volume group name
* *
* LCK_LV: * LCK_LV:
@ -77,6 +77,11 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);
#define LCK_MIRROR_NOSYNC_MODE 0x00000002U /* Mirrors don't require sync */ #define LCK_MIRROR_NOSYNC_MODE 0x00000002U /* Mirrors don't require sync */
#define LCK_DMEVENTD_MONITOR_MODE 0x00000004U /* Register with dmeventd */ #define LCK_DMEVENTD_MONITOR_MODE 0x00000004U /* Register with dmeventd */
/*
* Special cases of VG locks.
*/
#define VG_ORPHANS "#orphans"
#define VG_GLOBAL "#global"
/* /*
* Common combinations * Common combinations

12
tools/pvscan.c
View File

@ -124,12 +124,19 @@ int pvscan(struct cmd_context *cmd, int argc __attribute((unused)),
arg_count(cmd, exported_ARG) ? arg_count(cmd, exported_ARG) ?
"of exported volume group(s)" : "in no volume group"); "of exported volume group(s)" : "in no volume group");
if (!lock_vol(cmd, VG_GLOBAL, LCK_VG_WRITE)) {
log_error("Unable to obtain global lock.");
return ECMD_FAILED;
}
persistent_filter_wipe(cmd->filter); persistent_filter_wipe(cmd->filter);
lvmcache_destroy(); lvmcache_destroy();
log_verbose("Walking through all physical volumes"); log_verbose("Walking through all physical volumes");
if (!(pvslist = get_pvs(cmd))) if (!(pvslist = get_pvs(cmd))) {
unlock_vg(cmd, VG_GLOBAL);
return ECMD_FAILED; return ECMD_FAILED;
}
/* eliminate exported/new if required */ /* eliminate exported/new if required */
list_iterate_items(pvl, pvslist) { list_iterate_items(pvl, pvslist) {
@ -181,6 +188,7 @@ int pvscan(struct cmd_context *cmd, int argc __attribute((unused)),
if (!pvs_found) { if (!pvs_found) {
log_print("No matching physical volumes found"); log_print("No matching physical volumes found");
unlock_vg(cmd, VG_GLOBAL);
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }
@ -191,5 +199,7 @@ int pvscan(struct cmd_context *cmd, int argc __attribute((unused)),
display_size(cmd, (size_total - size_new)), display_size(cmd, (size_total - size_new)),
new_pvs_found, display_size(cmd, size_new)); new_pvs_found, display_size(cmd, size_new));
unlock_vg(cmd, VG_GLOBAL);
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }

6
tools/vgscan.c
View File

@ -51,6 +51,11 @@ int vgscan(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
if (!lock_vol(cmd, VG_GLOBAL, LCK_VG_WRITE)) {
log_error("Unable to obtain global lock.");
return ECMD_FAILED;
}
persistent_filter_wipe(cmd->filter); persistent_filter_wipe(cmd->filter);
lvmcache_destroy(); lvmcache_destroy();
@ -65,5 +70,6 @@ int vgscan(struct cmd_context *cmd, int argc, char **argv)
maxret = ret; maxret = ret;
} }
unlock_vg(cmd, VG_GLOBAL);
return maxret; return maxret;
} }