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

Add "--refresh" functionality to vgchange and vgmknodes.

Browse Source
This commit is contained in:
Peter Rajnoha 2008-12-22 09:00:51 +00:00
parent d6b42282c7
commit da1ba4ed88
6 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/commands.h
View File

@ -665,6 +665,7 @@ xx(vgchange,
"\t[--ignorelockingfailure]\n"
"\t[--ignoremonitoring]\n"
"\t[--monitor {y|n}]\n"
"\t[--refresh]\n"
"\t[-t|--test]" "\n"
"\t[-u|--uuid] " "\n"
"\t[-v|--verbose] " "\n"
@ -682,7 +683,8 @@ xx(vgchange,
addtag_ARG, alloc_ARG, allocation_ARG, autobackup_ARG, available_ARG,
clustered_ARG, deltag_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG,
logicalvolume_ARG, maxphysicalvolumes_ARG, monitor_ARG, partial_ARG,
physicalextentsize_ARG, resizeable_ARG, resizable_ARG, test_ARG, uuid_ARG)
physicalextentsize_ARG, refresh_ARG, resizeable_ARG, resizable_ARG,
test_ARG, uuid_ARG)
xx(vgck,
"Check the consistency of volume group(s)",
@ -834,11 +836,12 @@ xx(vgmknodes,
"\t[-d|--debug]\n"
"\t[-h|--help]\n"
"\t[--ignorelockingfailure]\n"
"\t[--refresh]\n"
"\t[-v|--verbose]\n"
"\t[--version]" "\n"
"\t[VolumeGroupName...]\n",
ignorelockingfailure_ARG)
ignorelockingfailure_ARG, refresh_ARG)
xx(vgreduce,
"Remove physical volume(s) from a volume group",

13
tools/toollib.c
View File

@ -1237,3 +1237,16 @@ int lv_refresh(struct cmd_context *cmd, struct logical_volume *lv)
{
return suspend_lv(cmd, lv) && resume_lv(cmd, lv);
}
int vg_refresh_visible(struct cmd_context *cmd, struct volume_group *vg)
{
struct lv_list *lvl;
int r = 1;
dm_list_iterate_items(lvl, &vg->lvs)
if (lv_is_visible(lvl->lv))
if (!lv_refresh(cmd, lvl->lv))
r = 0;
return r;
}

1
tools/toollib.h
View File

@ -102,4 +102,5 @@ int fill_vg_create_params(struct cmd_context *cmd,
struct vgcreate_params *vp_def);
int lv_refresh(struct cmd_context *cmd, struct logical_volume *lv);
int vg_refresh_visible(struct cmd_context *cmd, struct volume_group *vg);
#endif

19
tools/vgchange.c
View File

@ -510,6 +510,16 @@ static int _vgchange_uuid(struct cmd_context *cmd __attribute((unused)),
return ECMD_PROCESSED;
}
static int _vgchange_refresh(struct cmd_context *cmd, struct volume_group *vg)
{
log_verbose("Refreshing volume group \"%s\"", vg->name);
if (!vg_refresh_visible(cmd, vg))
return ECMD_FAILED;
return ECMD_PROCESSED;
}
static int vgchange_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg, int consistent,
void *handle __attribute((unused)))
@ -576,6 +586,9 @@ static int vgchange_single(struct cmd_context *cmd, const char *vg_name,
else if (arg_count(cmd, clustered_ARG))
r = _vgchange_clustered(cmd, vg);
else if (arg_count(cmd, refresh_ARG))
r = _vgchange_refresh(cmd, vg);
return r;
}
@ -588,9 +601,9 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv)
arg_count(cmd, addtag_ARG) + arg_count(cmd, uuid_ARG) +
arg_count(cmd, physicalextentsize_ARG) +
arg_count(cmd, clustered_ARG) + arg_count(cmd, alloc_ARG) +
arg_count(cmd, monitor_ARG))) {
log_error("One of -a, -c, -l, -p, -s, -x, --uuid, --alloc, "
"--addtag or --deltag required");
arg_count(cmd, monitor_ARG) + arg_count(cmd, refresh_ARG))) {
log_error("One of -a, -c, -l, -p, -s, -x, --refresh, "
"--uuid, --alloc, --addtag or --deltag required");
return EINVALID_CMD_LINE;
}

14
tools/vgmknodes.c
View File

@ -18,6 +18,10 @@
static int _vgmknodes_single(struct cmd_context *cmd, struct logical_volume *lv,
void *handle __attribute((unused)))
{
if (arg_count(cmd, refresh_ARG) && lv_is_visible(lv))
if (!lv_refresh(cmd, lv))
return ECMD_FAILED;
if (!lv_mknodes(cmd, lv))
return ECMD_FAILED;
@ -26,13 +30,9 @@ static int _vgmknodes_single(struct cmd_context *cmd, struct logical_volume *lv,
int vgmknodes(struct cmd_context *cmd, int argc, char **argv)
{
int r;
if (!lv_mknodes(cmd, NULL))
return ECMD_FAILED;
r = process_each_lv(cmd, argc, argv, LCK_VG_READ, NULL,
return process_each_lv(cmd, argc, argv, LCK_VG_READ, NULL,
&_vgmknodes_single);
if (!lv_mknodes(cmd, NULL) && (r < ECMD_FAILED))
r = ECMD_FAILED;
return r;
}

9
tools/vgrename.c
View File

@ -23,9 +23,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
int consistent = 1;
int match = 0;
int found_id = 0;
int symlinks_refresh_ok = 1;
struct dm_list *vgids;
struct lv_list *lvl;
struct str_list *sl;
char *vg_name_new;
const char *vgid = NULL, *vg_name, *vg_name_old;
@ -140,12 +138,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
log_verbose("Test mode: Skipping rename.");
else if (lvs_in_vg_activated_by_uuid_only(vg)) {
dm_list_iterate_items(lvl, &vg->lvs)
if (lv_is_visible(lvl->lv))
if (!lv_refresh(cmd, lvl->lv))
symlinks_refresh_ok = 0;
if (!symlinks_refresh_ok) {
if (!vg_refresh_visible(cmd, vg)) {
log_error("Renaming \"%s\" to \"%s\" failed",
old_path, new_path);
goto error;