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

Change background polldaemon's process name to "(lvm2)".

Browse Source 
Made .update_metadata optional in 'struct poll_functions' definitions;
eliminated _update_lvconvert_mirror() stub.

Tweak a mirror-specific error message in the generic polldaemon code.

Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mike Snitzer 2010-01-08 21:53:07 +00:00
parent 5f6519758f
commit c9f27b1ca1
3 changed files with 5 additions and 15 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.57 - Version 2.02.57 -
==================================== ====================================
Change background polldaemon's process name to "(lvm2)".
Allow vgremove of a VG with PVs missing. Allow vgremove of a VG with PVs missing.
Keep log type consistent when changing mirror image count. Keep log type consistent when changing mirror image count.
Always set environment variables for an LVM2 device in 11-dm-lvm.rules. Always set environment variables for an LVM2 device in 11-dm-lvm.rules.

11
tools/lvconvert.c
View File

@ -258,16 +258,6 @@ static struct logical_volume *_get_lvconvert_lv(struct cmd_context *cmd __attrib
return lv; return lv;
} }
static int _update_lvconvert_mirror(struct cmd_context *cmd __attribute((unused)),
struct volume_group *vg __attribute((unused)),
struct logical_volume *lv __attribute((unused)),
struct dm_list *lvs_changed __attribute((unused)),
unsigned flags __attribute((unused)))
{
/* lvconvert mirror doesn't require periodical metadata update */
return 1;
}
static int _finish_lvconvert_mirror(struct cmd_context *cmd, static int _finish_lvconvert_mirror(struct cmd_context *cmd,
struct volume_group *vg, struct volume_group *vg,
struct logical_volume *lv, struct logical_volume *lv,
@ -316,7 +306,6 @@ static struct poll_functions _lvconvert_mirror_fns = {
.get_copy_vg = _get_lvconvert_vg, .get_copy_vg = _get_lvconvert_vg,
.get_copy_lv = _get_lvconvert_lv, .get_copy_lv = _get_lvconvert_lv,
.poll_progress = poll_mirror_progress, .poll_progress = poll_mirror_progress,
.update_metadata = _update_lvconvert_mirror,
.finish_copy = _finish_lvconvert_mirror, .finish_copy = _finish_lvconvert_mirror,
}; };

8
tools/polldaemon.c
View File

@ -54,7 +54,7 @@ static int _become_daemon(struct cmd_context *cmd)
close(STDOUT_FILENO); close(STDOUT_FILENO);
close(STDERR_FILENO); close(STDERR_FILENO);
strncpy(*cmd->argv, "(lvm2copyd)", strlen(*cmd->argv)); strncpy(*cmd->argv, "(lvm2)", strlen(*cmd->argv));
reset_locking(); reset_locking();
lvmcache_init(); lvmcache_init();
@ -137,8 +137,8 @@ static int _check_lv_status(struct cmd_context *cmd,
if (!parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed)) if (!parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed))
return 0; return 0;
} else { } else {
if (!parms->poll_fns->update_metadata(cmd, vg, lv, lvs_changed, if (parms->poll_fns->update_metadata &&
0)) { !parms->poll_fns->update_metadata(cmd, vg, lv, lvs_changed, 0)) {
log_error("ABORTING: Segment progression failed."); log_error("ABORTING: Segment progression failed.");
parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed); parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed);
return 0; return 0;
@ -177,7 +177,7 @@ static int _wait_for_single_lv(struct cmd_context *cmd, const char *name, const
if (!(lv = parms->poll_fns->get_copy_lv(cmd, vg, name, uuid, if (!(lv = parms->poll_fns->get_copy_lv(cmd, vg, name, uuid,
parms->lv_type))) { parms->lv_type))) {
log_error("ABORTING: Can't find mirror LV in %s for %s", log_error("ABORTING: Can't find LV in %s for %s",
vg->name, name); vg->name, name);
unlock_and_release_vg(cmd, vg, vg->name); unlock_and_release_vg(cmd, vg, vg->name);
return 0; return 0;