lvm2-commits May 2015

lvm2-commits@lists.fedorahosted.org

7 participants
214 discussions

master - configure: fix missing [
by Zdenek Kabelac 20 May '15

20 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=682e0c898e7fd96f… Commit: 682e0c898e7fd96ff936b7113738f773335e0fff Parent: 788e4c54232372db6551d9a1323e1b59892900c1 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed May 20 09:07:49 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed May 20 09:32:03 2015 +0200 configure: fix missing [ --- configure | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6d5abc4..534948f 100755 --- a/configure +++ b/configure @@ -12425,7 +12425,7 @@ else fi - if test -z "$MSGFMT"]; then : + if test -z "$MSGFMT"; then : as_fn_error $? "msgfmt not found in path $PATH" "$LINENO" 5 fi diff --git a/configure.in b/configure.in index 75af936..86ab98a 100644 --- a/configure.in +++ b/configure.in @@ -1512,7 +1512,7 @@ if test "$INTL" = yes; then INTL_PACKAGE="lvm2" AC_PATH_TOOL(MSGFMT, msgfmt) - AS_IF(test -z "$MSGFMT"], [AC_MSG_ERROR([msgfmt not found in path $PATH])]) + AS_IF([test -z "$MSGFMT"], [AC_MSG_ERROR([msgfmt not found in path $PATH])]) AC_ARG_WITH(localedir, AC_HELP_STRING([--with-localedir=DIR],

1 0

master - WHATS_NEW: various updates
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=788e4c54232372db… Commit: 788e4c54232372db6551d9a1323e1b59892900c1 Parent: e6b5eb88f23701446653ed616b54bec15c54d42d Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Tue May 19 21:01:24 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 21:01:24 2015 +0200 WHATS_NEW: various updates --- WHATS_NEW | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index de3ddce..e14c858 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,8 @@ Version 2.02.121 - ================================ + Do not fail polling when poll LV not found (already finished or removed). + Replace poll_get_copy_vg/lv fns with vg_read() and find_lv() in polldaemon. + Close all device fds only in before sleep call in polldaemon. Version 2.02.120 - 15th May 2015 ================================

1 0

master - polldaemon.c: do not report error when LV not found
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e6b5eb88f2370144… Commit: e6b5eb88f23701446653ed616b54bec15c54d42d Parent: cf5b4a228612981ec5de358adad670014e885e4c Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Tue May 19 17:04:29 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:56:46 2015 +0200 polldaemon.c: do not report error when LV not found currently in wait_for_single_lv() fn trying to poll missing pvmove LV is considered success. It may have been already finished by another instance of polldaemon. either by another forked off polldaemon or by lvmpolld. Let's try to handle the mirror conversion and snapshot merge the same way. --- tools/polldaemon.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/polldaemon.c b/tools/polldaemon.c index 9f4fc94..fe2e7fd 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -160,18 +160,16 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, if (lv && parms->lv_type && !(lv->status & parms->lv_type)) lv = NULL; - if (!lv && parms->lv_type == PVMOVE) { - log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.", - id->display_name); - unlock_and_release_vg(cmd, vg, vg->name); - return 1; - } - if (!lv) { - log_error("ABORTING: Can't find LV in %s for %s.", - vg->name, id->display_name); + if (parms->lv_type == PVMOVE) + log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.", + id->display_name); + else + log_print_unless_silent("Can't find LV in %s for %s.", + vg->name, id->display_name); + unlock_and_release_vg(cmd, vg, vg->name); - return 0; + return 1; } /*

1 0

master - lvconvert.c: drop get_vg_lock_and_logical_volume fn
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cf5b4a228612981e… Commit: cf5b4a228612981ec5de358adad670014e885e4c Parent: f400f9db19324a29aeff6ad92039db91adc1e8f9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 19 16:46:11 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:56:32 2015 +0200 lvconvert.c: drop get_vg_lock_and_logical_volume fn --- tools/lvconvert.c | 81 +++++++++++++++++++++------------------------------- 1 files changed, 33 insertions(+), 48 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 9192d04..6e47f81 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -3231,37 +3231,6 @@ static int _lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv, return ECMD_PROCESSED; } -/* - * FIXME move to toollib along with the rest of the drop/reacquire - * VG locking that is used by _lvconvert_merge_single() - */ -static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context *cmd, - const char *vg_name, - const char *lv_name) -{ - /* - * Returns NULL if the requested LV doesn't exist; - * otherwise the caller must release_vg(lv->vg) - * - it is also up to the caller to unlock_vg() as needed - */ - struct volume_group *vg; - struct logical_volume* lv = NULL; - - vg = vg_read(cmd, vg_name, NULL, READ_FOR_UPDATE); - if (vg_read_error(vg)) { - release_vg(vg); - return_NULL; - } - - if (!(lv = find_lv(vg, lv_name))) { - log_error("Can't find LV %s in VG %s", lv_name, vg_name); - unlock_and_release_vg(cmd, vg, vg_name); - return NULL; - } - - return lv; -} - static int _poll_logical_volume(struct cmd_context *cmd, struct logical_volume *lv, int wait_completion) { @@ -3278,6 +3247,7 @@ static int _poll_logical_volume(struct cmd_context *cmd, struct logical_volume * static int lvconvert_single(struct cmd_context *cmd, struct lvconvert_params *lp) { struct logical_volume *lv; + struct volume_group *vg; int ret = ECMD_FAILED; int saved_ignore_suspended_devices = ignore_suspended_devices(); @@ -3286,21 +3256,29 @@ static int lvconvert_single(struct cmd_context *cmd, struct lvconvert_params *lp cmd->handles_missing_pvs = 1; } - if (!(lv = get_vg_lock_and_logical_volume(cmd, lp->vg_name, lp->lv_name))) + vg = vg_read(cmd, lp->vg_name, NULL, READ_FOR_UPDATE); + if (vg_read_error(vg)) { + release_vg(vg); goto_out; + } + + if (!(lv = find_lv(vg, lp->lv_name))) { + log_error("Can't find LV %s in VG %s", lp->lv_name, lp->vg_name); + unlock_and_release_vg(cmd, vg, lp->vg_name); + goto_out; + } /* * lp->pvh holds the list of PVs available for allocation or removal */ if (lp->pv_count) { - if (!(lp->pvh = create_pv_list(cmd->mem, lv->vg, lp->pv_count, - lp->pvs, 0))) + if (!(lp->pvh = create_pv_list(cmd->mem, vg, lp->pv_count, lp->pvs, 0))) goto_bad; } else - lp->pvh = &lv->vg->pvs; + lp->pvh = &vg->pvs; if (lp->replace_pv_count && - !(lp->replace_pvh = create_pv_list(cmd->mem, lv->vg, + !(lp->replace_pvh = create_pv_list(cmd->mem, vg, lp->replace_pv_count, lp->replace_pvs, 0))) goto_bad; @@ -3314,7 +3292,7 @@ bad: ret = _poll_logical_volume(cmd, lp->lv_to_poll, lp->wait_completion); - release_vg(lv->vg); + release_vg(vg); out: init_ignore_suspended_devices(saved_ignore_suspended_devices); return ret; @@ -3325,8 +3303,9 @@ static int _lvconvert_merge_single(struct cmd_context *cmd, struct logical_volum { struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle; const char *vg_name; - struct logical_volume *refreshed_lv; - int ret; + struct volume_group *vg_fresh; + struct logical_volume *lv_fresh; + int ret = ECMD_FAILED; /* * FIXME can't trust lv's VG to be current given that caller @@ -3335,16 +3314,23 @@ static int _lvconvert_merge_single(struct cmd_context *cmd, struct logical_volum * - preemptively drop the VG lock, as is needed for * _poll_logical_volume(), refresh LV (and VG in the process). */ + vg_name = lv->vg->name; unlock_vg(cmd, vg_name); - refreshed_lv = get_vg_lock_and_logical_volume(cmd, vg_name, lv->name); - if (!refreshed_lv) { - log_error("ABORTING: Can't reread LV %s/%s", vg_name, lv->name); - return ECMD_FAILED; + vg_fresh = vg_read(cmd, vg_name, NULL, READ_FOR_UPDATE); + if (vg_read_error(vg_fresh)) { + log_error("ABORTING: Can't reread VG %s", vg_name); + goto out; + } + + if (!(lv_fresh = find_lv(vg_fresh, lv->name))) { + log_error("ABORTING: Can't find LV %s in VG %s", lv->name, vg_name); + unlock_vg(cmd, vg_name); + goto out; } - lp->lv_to_poll = refreshed_lv; - if ((ret = _lvconvert_single(cmd, refreshed_lv, lp)) != ECMD_PROCESSED) + lp->lv_to_poll = lv_fresh; + if ((ret = _lvconvert_single(cmd, lv_fresh, lp)) != ECMD_PROCESSED) stack; if (ret == ECMD_PROCESSED && lp->need_polling) { @@ -3365,9 +3351,8 @@ static int _lvconvert_merge_single(struct cmd_context *cmd, struct logical_volum ret = ECMD_FAILED; } } - - release_vg(refreshed_lv->vg); - +out: + release_vg(vg_fresh); return ret; }

1 0

master - pvmove.c: code cleanup
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f400f9db19324a29… Commit: f400f9db19324a29aeff6ad92039db91adc1e8f9 Parent: 7a8ce8dbf73fc149c67b22e3b90f542f70944e93 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 19 15:27:36 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:56:24 2015 +0200 pvmove.c: code cleanup --- tools/pvmove.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/tools/pvmove.c b/tools/pvmove.c index d5b246f..f4b9d6c 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -585,10 +585,11 @@ static int _copy_id_components(struct cmd_context *cmd, } static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, - int argc, char **argv, union lvid *lvid, char **vg_name, + int argc, char **argv, union lvid *lvid, char **vg_name_copy, char **lv_mirr_name) { const char *lv_name = NULL; + const char *vg_name; char *pv_name_arg; struct volume_group *vg; struct dm_list *source_pvl; @@ -611,9 +612,10 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, return EINVALID_CMD_LINE; } + vg_name = pv_vg_name(pv); + if (arg_count(cmd, name_ARG)) { - if (!(lv_name = _extract_lvname(cmd, pv_vg_name(pv), - arg_value(cmd, name_ARG)))) { + if (!(lv_name = _extract_lvname(cmd, vg_name, arg_value(cmd, name_ARG)))) { stack; free_pv_fid(pv); return EINVALID_CMD_LINE; @@ -627,9 +629,9 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, } /* Read VG */ - log_verbose("Finding volume group \"%s\"", pv_vg_name(pv)); + log_verbose("Finding volume group \"%s\"", vg_name); - vg = vg_read(cmd, pv_vg_name(pv), NULL, READ_FOR_UPDATE); + vg = vg_read(cmd, vg_name, NULL, READ_FOR_UPDATE); if (vg_read_error(vg)) { release_vg(vg); return_ECMD_FAILED; @@ -686,7 +688,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, /* init_pvmove(1); */ /* vg->status |= PVMOVE; */ - if (!_copy_id_components(cmd, lv_mirr, vg_name, lv_mirr_name, lvid)) + if (!_copy_id_components(cmd, lv_mirr, vg_name_copy, lv_mirr_name, lvid)) goto out; if (flags & PVMOVE_FIRST_TIME) @@ -697,15 +699,16 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name, r = ECMD_PROCESSED; out: free_pv_fid(pv); - unlock_and_release_vg(cmd, vg, pv_vg_name(pv)); + unlock_and_release_vg(cmd, vg, vg_name); return r; } static int _read_poll_id_from_pvname(struct cmd_context *cmd, const char *pv_name, - union lvid *lvid, char **vg_name, char **lv_name, - unsigned *in_progress) + union lvid *lvid, char **vg_name_copy, + char **lv_name_copy, unsigned *in_progress) { int ret = 0; + const char *vg_name; struct logical_volume *lv; struct physical_volume *pv; struct volume_group *vg; @@ -718,8 +721,10 @@ static int _read_poll_id_from_pvname(struct cmd_context *cmd, const char *pv_nam if (!(pv = find_pv_by_name(cmd, pv_name, 0, 0))) return_0; + vg_name = pv_vg_name(pv); + /* need read-only access */ - vg = vg_read(cmd, pv_vg_name(pv), NULL, 0); + vg = vg_read(cmd, vg_name, NULL, 0); if (vg_read_error(vg)) { log_error("ABORTING: Can't read VG for %s.", pv_name); release_vg(vg); @@ -732,12 +737,12 @@ static int _read_poll_id_from_pvname(struct cmd_context *cmd, const char *pv_nam pv_name); ret = 1; *in_progress = 0; - } else if (_copy_id_components(cmd, lv, vg_name, lv_name, lvid)) { + } else if (_copy_id_components(cmd, lv, vg_name_copy, lv_name_copy, lvid)) { ret = 1; *in_progress = 1; } - unlock_and_release_vg(cmd, vg, pv_vg_name(pv)); + unlock_and_release_vg(cmd, vg, vg_name); free_pv_fid(pv); return ret; }

1 0

master - polldaemon: remove get_copy_vg and get_copy_lv wrappers
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7a8ce8dbf73fc149… Commit: 7a8ce8dbf73fc149c67b22e3b90f542f70944e93 Parent: 6fba37777c8a0931adf1164ff914aa494d8bcee8 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 19 15:13:01 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:56:15 2015 +0200 polldaemon: remove get_copy_vg and get_copy_lv wrappers These wrappers have been replaced by direct calls to vg_read() and find_lv() in previous commits. This commit should have no functional impact since all bits were already unreachable. --- lib/lvmpolld/polldaemon.h | 17 ----------------- tools/lvconvert.c | 6 ------ tools/lvpoll.c | 8 -------- tools/polldaemon.c | 26 -------------------------- tools/pvmove.c | 2 -- 5 files changed, 0 insertions(+), 59 deletions(-) diff --git a/lib/lvmpolld/polldaemon.h b/lib/lvmpolld/polldaemon.h index 2c7ce4b..36b654f 100644 --- a/lib/lvmpolld/polldaemon.h +++ b/lib/lvmpolld/polldaemon.h @@ -29,15 +29,6 @@ struct daemon_parms; struct poll_functions { const char *(*get_copy_name_from_lv) (const struct logical_volume *lv); - struct volume_group *(*get_copy_vg) (struct cmd_context *cmd, - const char *name, - const char *uuid, - uint32_t flags); - struct logical_volume *(*get_copy_lv) (struct cmd_context *cmd, - struct volume_group *vg, - const char *name, - const char *uuid, - uint64_t lv_type); progress_t (*poll_progress)(struct cmd_context *cmd, struct logical_volume *lv, const char *name, @@ -79,14 +70,6 @@ progress_t poll_mirror_progress(struct cmd_context *cmd, struct logical_volume *lv, const char *name, struct daemon_parms *parms); -struct volume_group *poll_get_copy_vg(struct cmd_context *cmd, const char *name, - const char *uuid, uint32_t flags); - -struct logical_volume *poll_get_copy_lv(struct cmd_context *cmd, - struct volume_group *vg, - const char *name, const char *uuid, - uint64_t lv_type); - int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, struct daemon_parms *parms); diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 7267c2f..9192d04 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -700,22 +700,16 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv, } static struct poll_functions _lvconvert_mirror_fns = { - .get_copy_vg = poll_get_copy_vg, - .get_copy_lv = poll_get_copy_lv, .poll_progress = poll_mirror_progress, .finish_copy = lvconvert_mirror_finish, }; static struct poll_functions _lvconvert_merge_fns = { - .get_copy_vg = poll_get_copy_vg, - .get_copy_lv = poll_get_copy_lv, .poll_progress = poll_merge_progress, .finish_copy = lvconvert_merge_finish, }; static struct poll_functions _lvconvert_thin_merge_fns = { - .get_copy_vg = poll_get_copy_vg, - .get_copy_lv = poll_get_copy_lv, .poll_progress = poll_thin_merge_progress, .finish_copy = lvconvert_merge_finish, }; diff --git a/tools/lvpoll.c b/tools/lvpoll.c index 0ed2d45..178392e 100644 --- a/tools/lvpoll.c +++ b/tools/lvpoll.c @@ -19,30 +19,22 @@ #include "polling_ops.h" static struct poll_functions _pvmove_fns = { - .get_copy_lv = poll_get_copy_lv, - .get_copy_vg = poll_get_copy_vg, .poll_progress = poll_mirror_progress, .update_metadata = pvmove_update_metadata, .finish_copy = pvmove_finish }; static struct poll_functions _convert_fns = { - .get_copy_lv = poll_get_copy_lv, - .get_copy_vg = poll_get_copy_vg, .poll_progress = poll_mirror_progress, .finish_copy = lvconvert_mirror_finish }; static struct poll_functions _merge_fns = { - .get_copy_lv = poll_get_copy_lv, - .get_copy_vg = poll_get_copy_vg, .poll_progress = poll_merge_progress, .finish_copy = lvconvert_merge_finish }; static struct poll_functions _thin_merge_fns = { - .get_copy_lv = poll_get_copy_lv, - .get_copy_vg = poll_get_copy_vg, .poll_progress = poll_thin_merge_progress, .finish_copy = lvconvert_merge_finish }; diff --git a/tools/polldaemon.c b/tools/polldaemon.c index d5daa62..9f4fc94 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -54,32 +54,6 @@ progress_t poll_mirror_progress(struct cmd_context *cmd, return PROGRESS_FINISHED_SEGMENT; } -struct volume_group *poll_get_copy_vg(struct cmd_context *cmd, - const char *name, - const char *uuid __attribute__((unused)), - uint32_t flags) -{ - if (name && !strchr(name, '/')) - return vg_read(cmd, name, NULL, flags); - - /* 'name' is the full LV name; must extract_vgname() */ - return vg_read(cmd, extract_vgname(cmd, name), NULL, flags); -} - -struct logical_volume *poll_get_copy_lv(struct cmd_context *cmd __attribute__((unused)), - struct volume_group *vg, - const char *name, - const char *uuid, - uint64_t lv_type) -{ - struct logical_volume *lv = find_lv(vg, name); - - if (!lv || (uuid && strcmp(uuid, (char *)&lv->lvid)) || (lv_type && !(lv->status & lv_type))) - return NULL; - - return lv; -} - static int _check_lv_status(struct cmd_context *cmd, struct volume_group *vg, struct logical_volume *lv, diff --git a/tools/pvmove.c b/tools/pvmove.c index dc36955..d5b246f 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -744,8 +744,6 @@ static int _read_poll_id_from_pvname(struct cmd_context *cmd, const char *pv_nam static struct poll_functions _pvmove_fns = { .get_copy_name_from_lv = get_pvmove_pvname_from_lv_mirr, - .get_copy_vg = poll_get_copy_vg, - .get_copy_lv = poll_get_copy_lv, .poll_progress = poll_mirror_progress, .update_metadata = pvmove_update_metadata, .finish_copy = pvmove_finish,

1 0

master - polldaemon.c: call find_lv directly
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6fba37777c8a0931… Commit: 6fba37777c8a0931adf1164ff914aa494d8bcee8 Parent: 08114840caf0a31d76b8870ec96594dd715baff0 Author: Ondrej Kozina <okozina(a)redhat.com> AuthorDate: Tue May 19 15:08:50 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:56:07 2015 +0200 polldaemon.c: call find_lv directly --- tools/polldaemon.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/polldaemon.c b/tools/polldaemon.c index 2cb56fa..d5daa62 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -179,7 +179,12 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, return 0; } - lv = parms->poll_fns->get_copy_lv(cmd, vg, id->lv_name, id->uuid, parms->lv_type); + lv = find_lv(vg, id->lv_name); + + if (lv && id->uuid && strcmp(id->uuid, (char *)&lv->lvid)) + lv = NULL; + if (lv && parms->lv_type && !(lv->status & parms->lv_type)) + lv = NULL; if (!lv && parms->lv_type == PVMOVE) { log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.", @@ -339,8 +344,13 @@ static int _poll_vg(struct cmd_context *cmd, const char *vgname, /* perform the poll operation on LVs collected in previous cycle */ dm_list_iterate_items(idl, &idls) { - lv = parms->poll_fns->get_copy_lv(cmd, vg, idl->id->lv_name, idl->id->uuid, parms->lv_type); - if (lv && _check_lv_status(cmd, vg, lv, idl->id->display_name, parms, &finished) && !finished) + if (!(lv = find_lv(vg, idl->id->lv_name))) + continue; + if (idl->id->uuid && strcmp(idl->id->uuid, (char *)&lv->lvid)) + continue; + if (parms->lv_type && !(lv->status & parms->lv_type)) + continue; + if (_check_lv_status(cmd, vg, lv, idl->id->display_name, parms, &finished) && !finished) parms->outstanding_count++; } @@ -386,7 +396,13 @@ static int report_progress(struct cmd_context *cmd, struct poll_operation_id *id return 0; } - lv = parms->poll_fns->get_copy_lv(cmd, vg, id->lv_name, id->uuid, parms->lv_type); + lv = find_lv(vg, id->lv_name); + + if (lv && id->uuid && strcmp(id->uuid, (char *)&lv->lvid)) + lv = NULL; + if (lv && parms->lv_type && !(lv->status & parms->lv_type)) + lv = NULL; + if (!lv && parms->lv_type == PVMOVE) { log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.", id->display_name);

1 0

master - lvconvert.c: call find_lv directly
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=08114840caf0a31d… Commit: 08114840caf0a31d76b8870ec96594dd715baff0 Parent: 0d300b70f911beacf099daa3950e1e77c30f27c2 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 19 14:50:58 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:55:57 2015 +0200 lvconvert.c: call find_lv directly --- tools/lvconvert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 48a4711..7267c2f 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -3259,7 +3259,7 @@ static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context return_NULL; } - if (!(lv = poll_get_copy_lv(cmd, vg, lv_name, NULL, 0))) { + if (!(lv = find_lv(vg, lv_name))) { log_error("Can't find LV %s in VG %s", lv_name, vg_name); unlock_and_release_vg(cmd, vg, vg_name); return NULL;

1 0

master - polldaemon.c: call vg_read directly
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0d300b70f911beac… Commit: 0d300b70f911beacf099daa3950e1e77c30f27c2 Parent: 15939e34353cc4bb89e674eac5b51a32fbd094e9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 19 14:40:40 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:55:50 2015 +0200 polldaemon.c: call vg_read directly replace calls in wait_for_single_lv() and report_progress() fns --- tools/polldaemon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/polldaemon.c b/tools/polldaemon.c index 7f25887..2cb56fa 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -171,7 +171,7 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, _sleep_and_rescan_devices(parms); /* Locks the (possibly renamed) VG again */ - vg = parms->poll_fns->get_copy_vg(cmd, id->vg_name, NULL, READ_FOR_UPDATE); + vg = vg_read(cmd, id->vg_name, NULL, READ_FOR_UPDATE); if (vg_read_error(vg)) { release_vg(vg); log_error("ABORTING: Can't reread VG for %s.", id->display_name); @@ -379,7 +379,7 @@ static int report_progress(struct cmd_context *cmd, struct poll_operation_id *id struct volume_group *vg; struct logical_volume *lv; - vg = parms->poll_fns->get_copy_vg(cmd, id->vg_name, NULL, 0); + vg = vg_read(cmd, id->vg_name, NULL, 0); if (vg_read_error(vg)) { release_vg(vg); log_error("Can't reread VG for %s", id->display_name);

1 0

master - lvconvert.c: call vg_read directly
by okozina 19 May '15

19 May '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=15939e34353cc4bb… Commit: 15939e34353cc4bb89e674eac5b51a32fbd094e9 Parent: 131c657735d3a315ceb9f072cb9a9591d363fa78 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue May 19 14:07:04 2015 +0200 Committer: Ondrej Kozina <okozina(a)redhat.com> CommitterDate: Tue May 19 20:55:41 2015 +0200 lvconvert.c: call vg_read directly --- tools/lvconvert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 5b2ab65..48a4711 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -3253,7 +3253,7 @@ static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context struct volume_group *vg; struct logical_volume* lv = NULL; - vg = poll_get_copy_vg(cmd, vg_name, NULL, READ_FOR_UPDATE); + vg = vg_read(cmd, vg_name, NULL, READ_FOR_UPDATE); if (vg_read_error(vg)) { release_vg(vg); return_NULL;

1 0

← Newer
1
2
3
4
5
6
7
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits May 2015