April 2016 - lvm2-commits - Fedora mailing-lists

v2_02_152 annotated tag has been created
by Alasdair Kergon 29 Apr '16

29 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b2492903a600973f… Commit: b2492903a600973fe9110285804b1c02b71d284c Parent: 0000000000000000000000000000000000000000 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: 2016-04-30 00:09 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: 2016-04-30 00:09 +0000 annotated tag: v2_02_152 has been created at b2492903a600973fe9110285804b1c02b71d284c (tag) tagging e53ecf91f7550b77d8b85545e49c5805332ddd8d (commit) replaces v2_02_151 Release 2.02.152. More bug fixes. 23 files changed, 321 insertions(+), 116 deletions(-) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iEYEABECAAYFAlcj9+QACgkQIoGRwVZ+LBe4iwCgiXA8V0KTpjBFmt7zjZxN7Nm/ ogwAoLNwaDOf6yBE1nG0KNmrSnfGCqIi =Yxmh -----END PGP SIGNATURE----- Alasdair G Kergon (5): post-release libdm: Add dm_udev_wait_immediate. datastruct: Add str_list_wipe. raid: Use inherited tags when wiping rmeta. pre-release David Teigland (3): metadata: fix segfault when filters reject devices lvmetad: improve warning after lvmetad message fails pvscan: autoactivation should ignore some VGs Peter Rajnoha (4): metadata: log warning instead of error if device not found while checking used and assumed devs cleanup: do not mention segment in warning message if device not found for a PV when checking used/assumed devs for an LV udev: rules: remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0) udev: rules: add comments explaining subsystem-specific rules Zdenek Kabelac (12): modprobe: check /sys/module entry first cache: with cache target 1.9 mq is alias to smq cache: check for clean cache as separete function thin: zero and transaction_id also with thin volumes lvchange: fix return code lvchange: always check for sigint lvchange: use better arg functions man: lvchange updates man: lvcreate doc passthrough cleanup: smaller timeout cleanup: use log_debug_activation cache: better support for alias check

1 0

master - post-release
by Alasdair Kergon 29 Apr '16

29 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=795e47cec572b133… Commit: 795e47cec572b13329eecbcfbbc0aa70f0bccc16 Parent: e53ecf91f7550b77d8b85545e49c5805332ddd8d Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Sat Apr 30 01:12:33 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Sat Apr 30 01:12:33 2016 +0100 post-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 3 +++ WHATS_NEW_DM | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index e3d1fb7..680848d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.152(2)-git (2016-04-30) +2.02.153(2)-git (2016-04-30) diff --git a/VERSION_DM b/VERSION_DM index dc7dbb4..1eb63a8 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.124-git (2016-04-30) +1.02.125-git (2016-04-30) diff --git a/WHATS_NEW b/WHATS_NEW index c6fe1db..7291482 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,3 +1,6 @@ +Version 2.02.153 - +================================== + Version 2.02.152 - 30th April 2016 ================================== Use any inherited tags when wiping metadata sub LVs to ensure activation. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 24561d4..f6392ef 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,6 @@ +Version 1.02.125 - +================================== + Version 1.02.124 - 30th April 2016 ================================== Add dm_udev_wait_immediate to libdevmapper for waiting outside the library.

1 0

master - pre-release
by Alasdair Kergon 29 Apr '16

29 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e53ecf91f7550b77… Commit: e53ecf91f7550b77d8b85545e49c5805332ddd8d Parent: c76df666c903b59f069292c4c1507b1ac37a5590 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Sat Apr 30 01:07:26 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Sat Apr 30 01:07:26 2016 +0100 pre-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 2 +- WHATS_NEW_DM | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index a9bd406..e3d1fb7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.152(2)-git (2016-04-23) +2.02.152(2)-git (2016-04-30) diff --git a/VERSION_DM b/VERSION_DM index da7e631..dc7dbb4 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.124-git (2016-04-23) +1.02.124-git (2016-04-30) diff --git a/WHATS_NEW b/WHATS_NEW index a712c5f..c6fe1db 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,4 +1,4 @@ -Version 2.02.152 - +Version 2.02.152 - 30th April 2016 ================================== Use any inherited tags when wiping metadata sub LVs to ensure activation. Add str_list_wipe. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index b21d7d5..24561d4 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,4 +1,4 @@ -Version 1.02.124 - +Version 1.02.124 - 30th April 2016 ================================== Add dm_udev_wait_immediate to libdevmapper for waiting outside the library.

1 0

master - raid: Use inherited tags when wiping rmeta.
by Alasdair Kergon 29 Apr '16

29 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c76df666c903b59f… Commit: c76df666c903b59f069292c4c1507b1ac37a5590 Parent: e3efcdc9f5d98807ff9887aa602aff1bdc870cbd Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Apr 29 19:49:21 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Apr 29 19:49:21 2016 +0100 raid: Use inherited tags when wiping rmeta. If there's an activation volume_filter, it might not be possible to activate the rmeta LVs to wipe them. At least inherit any LV tags from the parent LV while attempting this. --- WHATS_NEW | 1 + lib/metadata/lv_manip.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 55ecb68..a712c5f 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Use any inherited tags when wiping metadata sub LVs to ensure activation. Add str_list_wipe. Improve support for interrupting procesing of volumes during lvchange. Use failed command return code when lvchanging read-only volume. diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 4bce808..cd0a78c 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -3834,6 +3834,16 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, return 0; } lv_set_visible(meta_lv); + + /* + * Copy any tags from the new LV to the metadata LV so + * it can be activated temporarily. + */ + if (!str_list_dup(meta_lv->vg->vgmem, &meta_lv->tags, &lv->tags)) { + log_error("Failed to copy tags onto LV %s to clear metadata.", display_lvname(meta_lv)); + return 0; + } + clear_metadata = 1; } @@ -3882,6 +3892,9 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, return 0; } lv_set_hidden(meta_lv); + + /* Wipe any temporary tags required for activation. */ + str_list_wipe(&meta_lv->tags); } }

1 0

master - datastruct: Add str_list_wipe.
by Alasdair Kergon 29 Apr '16

29 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e3efcdc9f5d98807… Commit: e3efcdc9f5d98807ff9887aa602aff1bdc870cbd Parent: 16019b518e287da19c87eb64229f5c3ca057cb05 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Apr 29 19:47:15 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Apr 29 19:47:15 2016 +0100 datastruct: Add str_list_wipe. --- WHATS_NEW | 1 + lib/datastruct/str_list.c | 18 +++++++++++++----- lib/datastruct/str_list.h | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 3f036e1..55ecb68 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Add str_list_wipe. Improve support for interrupting procesing of volumes during lvchange. Use failed command return code when lvchanging read-only volume. Show creation transaction_id and zeroing state of pool with thin volume. diff --git a/lib/datastruct/str_list.c b/lib/datastruct/str_list.c index 3dfc6d7..6fe5672 100644 --- a/lib/datastruct/str_list.c +++ b/lib/datastruct/str_list.c @@ -92,7 +92,15 @@ void str_list_del(struct dm_list *sll, const char *str) dm_list_iterate_safe(slh, slht, sll) if (!strcmp(str, dm_list_item(slh, struct dm_str_list)->str)) - dm_list_del(slh); + dm_list_del(slh); +} + +void str_list_wipe(struct dm_list *sll) +{ + struct dm_list *slh, *slht; + + dm_list_iterate_safe(slh, slht, sll) + dm_list_del(slh); } int str_list_dup(struct dm_pool *mem, struct dm_list *sllnew, @@ -118,8 +126,8 @@ int str_list_match_item(const struct dm_list *sll, const char *str) struct dm_str_list *sl; dm_list_iterate_items(sl, sll) - if (!strcmp(str, sl->str)) - return 1; + if (!strcmp(str, sl->str)) + return 1; return 0; } @@ -153,8 +161,8 @@ int str_list_lists_equal(const struct dm_list *sll, const struct dm_list *sll2) return 0; dm_list_iterate_items(sl, sll) - if (!str_list_match_item(sll2, sl->str)) - return 0; + if (!str_list_match_item(sll2, sl->str)) + return 0; return 1; } diff --git a/lib/datastruct/str_list.h b/lib/datastruct/str_list.h index 82807f3..9f6d331 100644 --- a/lib/datastruct/str_list.h +++ b/lib/datastruct/str_list.h @@ -25,6 +25,7 @@ int str_list_add_list(struct dm_pool *mem, struct dm_list *sll, struct dm_list * int str_list_add_no_dup_check(struct dm_pool *mem, struct dm_list *sll, const char *str); int str_list_add_h_no_dup_check(struct dm_pool *mem, struct dm_list *sll, const char *str); void str_list_del(struct dm_list *sll, const char *str); +void str_list_wipe(struct dm_list *sll); int str_list_match_item(const struct dm_list *sll, const char *str); int str_list_match_list(const struct dm_list *sll, const struct dm_list *sll2, const char **tag_matched); int str_list_lists_equal(const struct dm_list *sll, const struct dm_list *sll2);

1 0

master - libdm: Add dm_udev_wait_immediate.
by Alasdair Kergon 27 Apr '16

27 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=16019b518e287da1… Commit: 16019b518e287da19c87eb64229f5c3ca057cb05 Parent: a2d2a61339b83de0d48ed6ed15e816773393c6b4 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Apr 28 00:54:27 2016 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Apr 28 00:54:27 2016 +0100 libdm: Add dm_udev_wait_immediate. dm_udev_wait() waits inside the library. dm_udev_wait_immediate allows the caller to do other things if the cookie isn't yet ready to be decremented. --- WHATS_NEW_DM | 1 + libdm/.exported_symbols.DM_1_02_124 | 1 + libdm/libdevmapper.h | 9 ++++++ libdm/libdm-common.c | 49 +++++++++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 7460a94..b21d7d5 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.124 - ================================== + Add dm_udev_wait_immediate to libdevmapper for waiting outside the library. Version 1.02.123 - 23rd April 2016 ================================== diff --git a/libdm/.exported_symbols.DM_1_02_124 b/libdm/.exported_symbols.DM_1_02_124 new file mode 100644 index 0000000..934011a --- /dev/null +++ b/libdm/.exported_symbols.DM_1_02_124 @@ -0,0 +1 @@ +dm_udev_wait_immediate diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index a90013f..d2f40c9 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -3218,6 +3218,15 @@ int dm_udev_create_cookie(uint32_t *cookie); int dm_udev_complete(uint32_t cookie); int dm_udev_wait(uint32_t cookie); +/* + * dm_dev_wait_immediate + * If *ready is 1 on return, the wait is complete. + * If *ready is 0 on return, the wait is incomplete and either + * this function or dm_udev_wait() must be called again. + * Returns 0 on error, when neither function should be called again. + */ +int dm_udev_wait_immediate(uint32_t cookie, int *ready); + #define DM_DEV_DIR_UMASK 0022 #define DM_CONTROL_NODE_UMASK 0177 diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 2580d94..d67d0bb 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -2082,6 +2082,14 @@ int dm_udev_wait(uint32_t cookie) return 1; } +int dm_udev_wait_immediate(uint32_t cookie, int *ready) +{ + update_devs(); + *ready = 1; + + return 1; +} + #else /* UDEV_SYNC_SUPPORT */ static int _check_semaphore_is_supported(void) @@ -2506,10 +2514,16 @@ int dm_udev_complete(uint32_t cookie) return 1; } -static int _udev_wait(uint32_t cookie) +/* + * If *nowait is set, return immediately leaving it set if the semaphore + * is not ready to be decremented to 0. *nowait is cleared if the wait + * succeeds. + */ +static int _udev_wait(uint32_t cookie, int *nowait) { int semid; struct sembuf sb = {0, 0, 0}; + int val; if (!cookie || !dm_udev_get_sync_support()) return 1; @@ -2517,6 +2531,21 @@ static int _udev_wait(uint32_t cookie) if (!_get_cookie_sem(cookie, &semid)) return_0; + /* Return immediately if the semaphore value exceeds 1? */ + if (*nowait) { + if ((val = semctl(semid, 0, GETVAL)) < 0) { + log_error("semid %d: sem_ctl GETVAL failed for " + "cookie 0x%" PRIx32 ": %s", + semid, cookie, strerror(errno)); + return 0; + } + + if (val > 1) + return 1; + + *nowait = 0; + } + if (!_udev_notify_sem_dec(cookie, semid)) { log_error("Failed to set a proper state for notification " "semaphore identified by cookie value %" PRIu32 " (0x%x) " @@ -2548,11 +2577,27 @@ repeat_wait: int dm_udev_wait(uint32_t cookie) { - int r = _udev_wait(cookie); + int nowait = 0; + int r = _udev_wait(cookie, &nowait); update_devs(); return r; } +int dm_udev_wait_immediate(uint32_t cookie, int *ready) +{ + int nowait = 1; + int r = _udev_wait(cookie, &nowait); + + if (r && nowait) { + *ready = 0; + return 1; + } + + update_devs(); + *ready = 1; + + return r; +} #endif /* UDEV_SYNC_SUPPORT */

1 0

master - pvscan: autoactivation should ignore some VGs
by David Teigland 27 Apr '16

27 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a2d2a61339b83de0… Commit: a2d2a61339b83de0d48ed6ed15e816773393c6b4 Parent: 263c1a4db51184c718e85c1c3fdcef7908dd7c88 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Apr 27 15:33:23 2016 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Apr 27 15:45:38 2016 -0500 pvscan: autoactivation should ignore some VGs pvscan autoactivation has its own VG processing implementation, so it can't properly handle things like foreign or shared VGs, so make it ignore those VG types (or errors from them) as best as possible. Add a FIXME stating that pvscan autoactivation must really be moved to the standard VG processing by calling process_each_vg to do activation once the scanning / cache update is finished. --- tools/pvscan.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/tools/pvscan.c b/tools/pvscan.c index 425383a..d93773a 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -132,6 +132,7 @@ static int _auto_activation_handler(struct cmd_context *cmd, int refresh_done = 0; struct volume_group *vg; struct id vgid_raw; + uint32_t read_error; int r = 0; /* TODO: add support for partial and clustered VGs */ @@ -141,16 +142,45 @@ static int _auto_activation_handler(struct cmd_context *cmd, if (!id_read_format(&vgid_raw, vgid)) return_0; + /* + * FIXME: pvscan activation really needs to be changed to use + * the standard process_each_vg() interface. It should save + * a list of VG names that are found during the scan, then + * call process_each_vg() with that list to do activation. + */ + + cmd->vg_read_print_access_error = 0; + /* NB. This is safe because we know lvmetad is running and we won't hit disk. */ vg = vg_read(cmd, vgname, (const char *)&vgid_raw, 0, 0); - if (vg_read_error(vg)) { + read_error = vg_read_error(vg); + if (read_error) { + /* + * foreign VGs: we want to read and update lvmetad, but that's + * all, we don't want to even attempt to autoactivate. + * + * shared VGs: we want to read and update lvmetad, and for now + * ignore them for autoactivation. Once pvscan autoactivation + * uses process_each_vg, then shared VGs could be autoactivated. + */ + if (read_error & (FAILED_SYSTEMID | FAILED_LOCK_TYPE | FAILED_LOCK_MODE)) { + release_vg(vg); + return 1; + } + log_error("Failed to read Volume Group \"%s\" (%s) during autoactivation.", vgname, vgid); release_vg(vg); return 0; } + if (is_lockd_type(vg->lock_type)) { + r = 1; + goto out; + } + if (vg_is_clustered(vg)) { - r = 1; goto out; + r = 1; + goto out; } /* FIXME: There's a tiny race when suspending the device which is part

1 0

master - lvmetad: improve warning after lvmetad message fails
by David Teigland 27 Apr '16

27 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=263c1a4db51184c7… Commit: 263c1a4db51184c718e85c1c3fdcef7908dd7c88 Parent: 3c53acb378478f23acf624be8836c0cb24c2724e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Apr 27 14:49:27 2016 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Apr 27 15:38:34 2016 -0500 lvmetad: improve warning after lvmetad message fails Make it more consistent with the other similar warning. --- lib/cache/lvmetad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index 8a1a2c5..8b63696 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -643,7 +643,7 @@ fail: * commands will not use it until it's been properly repopulated. */ if (action_modifies) - log_error("lvmetad update failed. Restart lvmetad immediately."); + log_warn("WARNING: To avoid corruption, restart lvmetad (or disable with use_lvmetad=0)."); return 0; }

1 0

master - metadata: fix segfault when filters reject devices
by David Teigland 27 Apr '16

27 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3c53acb378478f23… Commit: 3c53acb378478f23acf624be8836c0cb24c2724e Parent: 49f32e4859017104555ba0297fa0384d4aa3d5f2 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Apr 27 12:13:26 2016 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Apr 27 12:13:26 2016 -0500 metadata: fix segfault when filters reject devices Checking for devices uses is_missing_pv() to check if there is a device for the PV. is_missing_pv() is based on the MISSING_PV flag, which does not always correspond to !pv->dev. When using lvmetad, a command like: pvs --config 'devices/filter=["a|/dev/sdb|", "r|.*|"]' will cause a number of PVs to have NULL pv->dev, but not the MISSING_PV flag. So, NULL pv->dev needs to also be checked. --- lib/metadata/metadata.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 6d101e0..c8237d5 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4682,6 +4682,15 @@ static int _check_devs_used_correspond_with_vg(struct volume_group *vg) /* Mark all PVs in VG as used. */ dm_list_iterate_items(pvl, &vg->pvs) { + /* + * FIXME: It's not clear if the meaning + * of "missing" should always include the + * !pv->dev case, or if "missing" is the + * more narrow case where VG metadata has + * been written with the MISSING flag. + */ + if (!pvl->pv->dev) + continue; if (is_missing_pv(pvl->pv)) continue; pvl->pv->dev->flags |= DEV_ASSUMED_FOR_LV;

1 0

master - cache: better support for alias check
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=49f32e4859017104… Commit: 49f32e4859017104555ba0297fa0384d4aa3d5f2 Parent: 2a2efab0b11b7bfeef1a60b6cfd61c8bceb67164 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 27 00:19:04 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 27 00:20:37 2016 +0200 cache: better support for alias check To still support disabling of policies for test we need better logic for alias detection introduced in 588455d03ea40ffa37f466023691b0ec2bdf5e82. --- lib/cache_segtype/cache.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c index be9a57e..199bda6 100644 --- a/lib/cache_segtype/cache.c +++ b/lib/cache_segtype/cache.c @@ -208,12 +208,13 @@ static int _target_present(struct cmd_context *cmd, uint32_t maj; uint32_t min; unsigned cache_feature; + unsigned cache_alias; const char feature[12]; const char module[12]; /* check dm-%s */ } _features[] = { - { 1, 9, CACHE_FEATURE_POLICY_SMQ | CACHE_FEATURE_POLICY_MQ, "policy_smq", "cache-smq" }, - { 1, 8, CACHE_FEATURE_POLICY_SMQ, "policy_smq", "cache-smq" }, - { 1, 3, CACHE_FEATURE_POLICY_MQ, "policy_mq", "cache-mq" }, + { 1, 9, 0, CACHE_FEATURE_POLICY_MQ, "policy_smq", "cache-smq" }, + { 1, 8, CACHE_FEATURE_POLICY_SMQ, 0, "policy_smq", "cache-smq" }, + { 1, 3, CACHE_FEATURE_POLICY_MQ, 0, "policy_mq", "cache-mq" }, }; static const char _lvmconf[] = "global/cache_disabled_features"; static unsigned _attrs = 0; @@ -253,7 +254,8 @@ static int _target_present(struct cmd_context *cmd, (!_features[i].module[0] || (_attrs & _features[i].cache_feature) || /* already present */ module_present(cmd, _features[i].module))) - _attrs |= _features[i].cache_feature; + _attrs |= _features[i].cache_feature | + _features[i].cache_alias; else log_very_verbose("Target %s does not support %s.", _cache_module, _features[i].feature);

1 0

master - cleanup: use log_debug_activation
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2a2efab0b11b7bfe… Commit: 2a2efab0b11b7bfeef1a60b6cfd61c8bceb67164 Parent: c81005dcc46bc55d0d4e5094f6ef99e36cecd486 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Apr 27 00:01:08 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Apr 27 00:01:08 2016 +0200 cleanup: use log_debug_activation --- lib/activate/activate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index f554f19..5a7e99e 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2013 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2016 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. * @@ -615,7 +615,7 @@ int module_present(struct cmd_context *cmd, const char *target_name) path[i] = '_'; /* replace '-' with '_' */ if ((lstat(path, &st) == 0) && S_ISDIR(st.st_mode)) { - log_debug("Module directory %s exists.", path); + log_debug_activation("Module directory %s exists.", path); return 1; } }

1 0

master - cleanup: smaller timeout
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c81005dcc46bc55d… Commit: c81005dcc46bc55d0d4e5094f6ef99e36cecd486 Parent: 07d92322c13e942b8a47b4370a82b70d33a6f0c8 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 26 23:59:20 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:59:20 2016 +0200 cleanup: smaller timeout 1s -> 0.5s Also indent fix. --- lib/metadata/cache_manip.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index bf3d405..e998670 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -314,10 +314,11 @@ int lv_cache_wait_for_clean(struct logical_volume *cache_lv, int *is_clean) break; if (cleaner_policy) { - log_print_unless_silent(FMTu64 " blocks must still be flushed.", - dirty_blocks); - sleep(1); - continue; + log_print_unless_silent(FMTu64 " blocks must still be flushed.", + dirty_blocks); + /* TODO: Use centralized place */ + usleep(500000); + continue; } /* Switch to cleaner policy to flush the cache */ @@ -326,7 +327,7 @@ int lv_cache_wait_for_clean(struct logical_volume *cache_lv, int *is_clean) cache_seg->cleaner_policy = 1; /* Reaload kernel with "cleaner" policy */ if (!lv_update_and_reload_origin(cache_lv)) - return_0; + return_0; } *is_clean = 1;

1 0

master - man: lvcreate doc passthrough
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=07d92322c13e942b… Commit: 07d92322c13e942b8a47b4370a82b70d33a6f0c8 Parent: d90d99b23d94dea41b65166f8bb19cb2883e527c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Apr 25 13:38:24 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:29:58 2016 +0200 man: lvcreate doc passthrough Add few more words about passthough mode. --- man/lvcreate.8.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in index f6bb14f..fd8b3a7 100644 --- a/man/lvcreate.8.in +++ b/man/lvcreate.8.in @@ -219,7 +219,10 @@ If \fBwritethough\fP is specified, a write is considered complete only when it has been stored in the cache pool LV and on the origin LV. While \fBwritethrough\fP may be slower for writes, it is more resilient if something should happen to a device associated with the -cache pool LV. +cache pool LV. With \fBpassthrough\fP mode, all reads are served +from origin LV (all reads miss the cache) and all writes are +forwarded to the origin LV; additionally, write hits cause cache +block invalidates. See \fBlvmcache(7)\fP for more details. . .HP .BR \-\-cachepolicy

1 0

master - man: lvchange updates
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d90d99b23d94dea4… Commit: d90d99b23d94dea41b65166f8bb19cb2883e527c Parent: e77b6968b6b420a4d0d9f14af1386f28761f055b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Apr 24 11:40:59 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:29:58 2016 +0200 man: lvchange updates Drop never existing --degrade. --- man/lvchange.8.in | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/man/lvchange.8.in b/man/lvchange.8.in index fb16530..34ce583 100644 --- a/man/lvchange.8.in +++ b/man/lvchange.8.in @@ -26,15 +26,14 @@ lvchange \(em change attributes of a logical volume .RB [ \-A | \-\-autobackup .RB { y | n }] .RB [ \-\-cachepolicy -.IR policy ] +.IR Policy ] .RB [ \-\-cachesettings -.IR key \fB= value ] +.IR Key \fB= Value ] .RB [ \-\-commandprofile .IR ProfileName ] .RB [ \-C | \-\-contiguous .RB { y | n }] .RB [ \-d | \-\-debug ] -.RB [ \-\-degraded ] .RB [ \-\-deltag .IR Tag ] .RB [ \-\-detachprofile ] @@ -57,9 +56,9 @@ lvchange \(em change attributes of a logical volume .RB [ \-M | \-\-persistent .RB { y | n } .RB [ \-\-major -.IR major ] +.IR Major ] .RB [ \-\-minor -.IR minor ]] +.IR Minor ]] .RB [ \-\-poll .RB { y | n }] .RB [ \-\- [ raid ] maxrecoveryrate @@ -188,9 +187,9 @@ of the flag is reported within \fBlv_attr\fP bits. . .HP .BR \-\-cachepolicy -.IR policy , +.IR Policy , .BR \-\-cachesettings -.IR key \fB= value +.IR Key \fB= Value .br Only applicable to cached LVs; see also \fBlvmcache(7)\fP. Sets the cache policy and its associated tunable settings. In most use-cases, @@ -240,7 +239,7 @@ Do not use this if dmeventd is already monitoring a device. . .HP .BR \-\-major -.IR major +.IR Major .br Sets the major number. This option is supported only on older systems (kernel version 2.4) and is ignored on modern Linux systems where major @@ -248,7 +247,7 @@ numbers are dynamically assigned. . .HP .BR \-\-minor -.IR minor +.IR Minor .br Set the minor number. .

1 0

master - lvchange: use better arg functions
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e77b6968b6b420a4… Commit: e77b6968b6b420a4d0d9f14af1386f28761f055b Parent: c215e1be5ce35177a0491c0d6495865efbe34b51 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 26 22:04:19 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:29:58 2016 +0200 lvchange: use better arg functions --- tools/lvchange.c | 77 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 31 deletions(-) diff --git a/tools/lvchange.c b/tools/lvchange.c index 6a6a619..83da6bc 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -911,21 +911,32 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, return_ECMD_FAILED; if (!(lv->vg->status & LVM_WRITE) && - (arg_count(cmd, contiguous_ARG) || arg_count(cmd, permission_ARG) || - arg_count(cmd, readahead_ARG) || arg_count(cmd, persistent_ARG) || - arg_count(cmd, discards_ARG) || arg_count(cmd, zero_ARG) || - arg_count(cmd, alloc_ARG) || arg_count(cmd, profile_ARG) || - arg_count(cmd, metadataprofile_ARG))) { + arg_from_list_is_set(cmd, NULL, + alloc_ARG, + contiguous_ARG, + discards_ARG, + metadataprofile_ARG, + permission_ARG, + persistent_ARG, + profile_ARG, + readahead_ARG, + zero_ARG, + -1)) { log_error("Only -a permitted with read-only volume " "group \"%s\"", lv->vg->name); return ECMD_FAILED; } if (lv_is_origin(lv) && !lv_is_thin_volume(lv) && - (arg_count(cmd, contiguous_ARG) || arg_count(cmd, permission_ARG) || - arg_count(cmd, readahead_ARG) || arg_count(cmd, persistent_ARG) || - arg_count(cmd, alloc_ARG) || arg_count(cmd, profile_ARG) || - arg_count(cmd, metadataprofile_ARG))) { + arg_from_list_is_set(cmd, NULL, + alloc_ARG, + contiguous_ARG, + metadataprofile_ARG, + permission_ARG, + persistent_ARG, + profile_ARG, + readahead_ARG, + -1)) { log_error("Can't change logical volume \"%s\" under snapshot", lv->name); return ECMD_FAILED; @@ -1173,29 +1184,33 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv) * --monitor or --poll). */ int update_partial_safe = /* options safe to update if partial */ - arg_count(cmd, contiguous_ARG) || - arg_count(cmd, permission_ARG) || - arg_count(cmd, readahead_ARG) || - arg_count(cmd, persistent_ARG) || - arg_count(cmd, addtag_ARG) || - arg_count(cmd, deltag_ARG) || - arg_count(cmd, metadataprofile_ARG) || - arg_count(cmd, profile_ARG) || - arg_count(cmd, detachprofile_ARG) || - arg_count(cmd, setactivationskip_ARG); + arg_from_list_is_set(cmd, NULL, + addtag_ARG, + contiguous_ARG, + deltag_ARG, + detachprofile_ARG, + metadataprofile_ARG, + permission_ARG, + persistent_ARG, + profile_ARG, + readahead_ARG, + setactivationskip_ARG, + -1); int update_partial_unsafe = - arg_count(cmd, alloc_ARG) || - arg_count(cmd, discards_ARG) || - arg_count(cmd, errorwhenfull_ARG) || - arg_count(cmd, minrecoveryrate_ARG) || - arg_count(cmd, maxrecoveryrate_ARG) || - arg_count(cmd, resync_ARG) || - arg_count(cmd, syncaction_ARG) || - arg_count(cmd, cachepolicy_ARG) || - arg_count(cmd, cachesettings_ARG) || - arg_count(cmd, writebehind_ARG) || - arg_count(cmd, writemostly_ARG) || - arg_count(cmd, zero_ARG); + arg_from_list_is_set(cmd, NULL, + alloc_ARG, + cachepolicy_ARG, + cachesettings_ARG, + discards_ARG, + errorwhenfull_ARG, + maxrecoveryrate_ARG, + minrecoveryrate_ARG, + resync_ARG, + syncaction_ARG, + writebehind_ARG, + writemostly_ARG, + zero_ARG, + -1); int update = update_partial_safe || update_partial_unsafe; if (!update &&

1 0

master - lvchange: always check for sigint
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c215e1be5ce35177… Commit: c215e1be5ce35177a0491c0d6495865efbe34b51 Parent: d8bdc7af3749cbdc9110057daa837d2fe19dcf72 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Apr 25 13:44:42 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:29:08 2016 +0200 lvchange: always check for sigint Check sigint() state during process_each_lv. --- WHATS_NEW | 1 + tools/lvchange.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index d557459..3f036e1 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Improve support for interrupting procesing of volumes during lvchange. Use failed command return code when lvchanging read-only volume. Show creation transaction_id and zeroing state of pool with thin volume. Stop checking for dm_cache_mq policy with cache target 1.9 (alias to smq). diff --git a/tools/lvchange.c b/tools/lvchange.c index 0f46e2c..6a6a619 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -907,6 +907,9 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, struct logical_volume *origin; char snaps_msg[128]; + if (sigint_caught()) + return_ECMD_FAILED; + if (!(lv->vg->status & LVM_WRITE) && (arg_count(cmd, contiguous_ARG) || arg_count(cmd, permission_ARG) || arg_count(cmd, readahead_ARG) || arg_count(cmd, persistent_ARG) || @@ -1062,8 +1065,6 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, return_ECMD_FAILED; doit += _lvchange_persistent(cmd, lv); docmds++; - if (sigint_caught()) - return_ECMD_FAILED; } if (arg_count(cmd, discards_ARG) ||

1 0

master - lvchange: fix return code
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d8bdc7af3749cbdc… Commit: d8bdc7af3749cbdc9110057daa837d2fe19dcf72 Parent: 84a5b19539483e5f06b4a1405bb76e46ce9226b2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Apr 25 13:40:26 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:28:01 2016 +0200 lvchange: fix return code We already opened VG for this - so not an invalid cmdline. --- WHATS_NEW | 1 + tools/lvchange.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index b6d9fd2..d557459 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Use failed command return code when lvchanging read-only volume. Show creation transaction_id and zeroing state of pool with thin volume. Stop checking for dm_cache_mq policy with cache target 1.9 (alias to smq). Check first /sys/module/dm_* dir existance before using modprobe. diff --git a/tools/lvchange.c b/tools/lvchange.c index 631d7f8..0f46e2c 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -915,7 +915,7 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, arg_count(cmd, metadataprofile_ARG))) { log_error("Only -a permitted with read-only volume " "group \"%s\"", lv->vg->name); - return EINVALID_CMD_LINE; + return ECMD_FAILED; } if (lv_is_origin(lv) && !lv_is_thin_volume(lv) &&

1 0

master - thin: zero and transaction_id also with thin volumes
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=84a5b19539483e5f… Commit: 84a5b19539483e5f06b4a1405bb76e46ce9226b2 Parent: 8b5967e1e3313e8f9caa8065e170dd35ada8e57a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Apr 23 21:08:46 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:24:51 2016 +0200 thin: zero and transaction_id also with thin volumes Show trasaction_id when thin volume was created. Also show zeroing state of thin-pool with thin volume (so user doesn't need to lookup thin-pool). --- WHATS_NEW | 1 + lib/report/columns.h | 4 ++-- lib/report/report.c | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 4b33913..b6d9fd2 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Show creation transaction_id and zeroing state of pool with thin volume. Stop checking for dm_cache_mq policy with cache target 1.9 (alias to smq). Check first /sys/module/dm_* dir existance before using modprobe. Remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0). diff --git a/lib/report/columns.h b/lib/report/columns.h index 7f5e11d..b31b3f1 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -191,8 +191,8 @@ FIELD(SEGS, seg, SIZ, "Chunk", list, 0, chunksize, chunk_size, "For snapshots, t FIELD(SEGS, seg, NUM, "#Thins", list, 0, thincount, thin_count, "For thin pools, the number of thin volumes in this pool.", 0) FIELD(SEGS, seg, STR, "Discards", list, 0, discards, discards, "For thin pools, how discards are handled.", 0) FIELD(SEGS, seg, STR, "CacheMode", list, 0, cachemode, cache_mode, "For cache pools, how writes are cached.", 0) -FIELD(SEGS, seg, BIN, "Zero", list, 0, thinzero, zero, "For thin pools, if zeroing is enabled.", 0) -FIELD(SEGS, seg, NUM, "TransId", list, 0, transactionid, transaction_id, "For thin pools, the transaction id.", 0) +FIELD(SEGS, seg, BIN, "Zero", list, 0, thinzero, zero, "For thin pools and volumes, if zeroing is enabled.", 0) +FIELD(SEGS, seg, NUM, "TransId", list, 0, transactionid, transaction_id, "For thin pools, the transaction id and creation transaction id for thins.", 0) FIELD(SEGS, seg, NUM, "ThId", list, 0, thinid, thin_id, "For thin volume, the thin device id.", 0) FIELD(SEGS, seg, SIZ, "Start", list, 0, segstart, seg_start, "Offset within the LV to the start of the segment in current units.", 0) FIELD(SEGS, seg, NUM, "Start", list, 0, segstartpe, seg_start_pe, "Offset within the LV to the start of the segment in physical extents.", 0) diff --git a/lib/report/report.c b/lib/report/report.c index abf6a9e..016d41d 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -2446,7 +2446,7 @@ static int _transactionid_disp(struct dm_report *rh, struct dm_pool *mem, { const struct lv_segment *seg = (const struct lv_segment *) data; - if (seg_is_thin_pool(seg)) + if (seg_is_thin_pool(seg) || seg_is_thin_volume(seg)) return dm_report_field_uint64(rh, field, &seg->transaction_id); return _field_set_value(field, "", &GET_TYPE_RESERVED_VALUE(num_undef_64)); @@ -3478,6 +3478,9 @@ static int _thinzero_disp(struct dm_report *rh, struct dm_pool *mem, { const struct lv_segment *seg = (const struct lv_segment *) data; + if (seg_is_thin_volume(seg)) + seg = first_seg(seg->pool_lv); + if (seg_is_thin_pool(seg)) return _binary_disp(rh, mem, field, seg->zero_new_blocks, GET_FIRST_RESERVED_NAME(zero_y), private);

1 0

master - cache: check for clean cache as separete function
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8b5967e1e3313e8f… Commit: 8b5967e1e3313e8f9caa8065e170dd35ada8e57a Parent: 588455d03ea40ffa37f466023691b0ec2bdf5e82 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 26 21:45:48 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:24:17 2016 +0200 cache: check for clean cache as separete function --- lib/metadata/cache_manip.c | 98 ++++++++++++++++++++++---------------- lib/metadata/metadata-exported.h | 1 + 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index 46cb6a8..bf3d405 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -279,6 +279,61 @@ struct logical_volume *lv_cache_create(struct logical_volume *pool_lv, } /* + * Checks cache status and loops until there are not dirty blocks + * Set 1 to *is_clean when there are no dirty blocks on return. + */ +int lv_cache_wait_for_clean(struct logical_volume *cache_lv, int *is_clean) +{ + struct lv_segment *cache_seg = first_seg(cache_lv); + struct lv_status_cache *status; + int cleaner_policy; + uint64_t dirty_blocks; + + *is_clean = 0; + + //FIXME: use polling to do this... + for (;;) { + if (!lv_cache_status(cache_lv, &status)) + return_0; + if (status->cache->fail) { + dm_pool_destroy(status->mem); + log_warn("WARNING: Skippping flush for failed cache."); + return 1; + } + + cleaner_policy = !strcmp(status->cache->policy_name, "cleaner"); + dirty_blocks = status->cache->dirty_blocks; + + /* No clear policy and writeback mode means dirty */ + if (!cleaner_policy && + (status->cache->feature_flags & DM_CACHE_FEATURE_WRITEBACK)) + dirty_blocks++; + dm_pool_destroy(status->mem); + + if (!dirty_blocks) + break; + + if (cleaner_policy) { + log_print_unless_silent(FMTu64 " blocks must still be flushed.", + dirty_blocks); + sleep(1); + continue; + } + + /* Switch to cleaner policy to flush the cache */ + log_print_unless_silent("Flushing cache for %s.", + display_lvname(cache_lv)); + cache_seg->cleaner_policy = 1; + /* Reaload kernel with "cleaner" policy */ + if (!lv_update_and_reload_origin(cache_lv)) + return_0; + } + + *is_clean = 1; + + return 1; +} +/* * lv_cache_remove * @cache_lv * @@ -291,12 +346,10 @@ struct logical_volume *lv_cache_create(struct logical_volume *pool_lv, */ int lv_cache_remove(struct logical_volume *cache_lv) { - int is_cleaner; - uint64_t dirty_blocks; struct lv_segment *cache_seg = first_seg(cache_lv); struct logical_volume *corigin_lv; struct logical_volume *cache_pool_lv; - struct lv_status_cache *status; + int is_clear; if (!lv_is_cache(cache_lv)) { log_error(INTERNAL_ERROR "LV %s is not cache volume.", @@ -356,45 +409,8 @@ int lv_cache_remove(struct logical_volume *cache_lv) * remove the cache_pool then without waiting for the flush to * complete. */ - if (!lv_cache_status(cache_lv, &status)) + if (!lv_cache_wait_for_clean(cache_lv, &is_clear)) return_0; - if (!status->cache->fail) { - is_cleaner = !strcmp(status->cache->policy_name, "cleaner"); - dirty_blocks = status->cache->dirty_blocks; - if (!(status->cache->feature_flags & DM_CACHE_FEATURE_WRITETHROUGH)) - dirty_blocks++; /* Not writethrough - always dirty */ - } else { - log_warn("WARNING: Skippping flush for failed cache."); - is_cleaner = 0; - dirty_blocks = 0; - } - dm_pool_destroy(status->mem); - - if (dirty_blocks && !is_cleaner) { - /* Switch to cleaner policy to flush the cache */ - log_print_unless_silent("Flushing cache for %s.", cache_lv->name); - cache_seg->cleaner_policy = 1; - /* update the kernel to put the cleaner policy in place */ - if (!lv_update_and_reload_origin(cache_lv)) - return_0; - } - - //FIXME: use polling to do this... - while (dirty_blocks) { - if (!lv_cache_status(cache_lv, &status)) - return_0; - if (status->cache->fail) { - log_warn("WARNING: Flushing of failing cache skipped."); - break; - } - dirty_blocks = status->cache->dirty_blocks; - dm_pool_destroy(status->mem); - if (dirty_blocks) { - log_print_unless_silent(FMTu64 " blocks must still be flushed.", - dirty_blocks); - sleep(1); - } - } cache_pool_lv = cache_seg->pool_lv; if (!detach_pool_lv(cache_seg)) diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 039708e..8c4dfc3 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -1226,6 +1226,7 @@ int validate_lv_cache_create_pool(const struct logical_volume *pool_lv); int validate_lv_cache_create_origin(const struct logical_volume *origin_lv); struct logical_volume *lv_cache_create(struct logical_volume *pool, struct logical_volume *origin); +int lv_cache_wait_for_clean(struct logical_volume *cache_lv, int *is_clean); int lv_cache_remove(struct logical_volume *cache_lv); int wipe_cache_pool(struct logical_volume *cache_pool_lv); /* -- metadata/cache_manip.c */

1 0

master - cache: with cache target 1.9 mq is alias to smq
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=588455d03ea40ffa… Commit: 588455d03ea40ffa37f466023691b0ec2bdf5e82 Parent: aa91fe3d3c3e6c2d8d96f5c0766b58375a44daa9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 26 21:43:41 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:24:05 2016 +0200 cache: with cache target 1.9 mq is alias to smq Avoid useless check for mq policy, it's loaded as smq and aliased. --- WHATS_NEW | 1 + lib/cache_segtype/cache.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 2a4fdd5..4b33913 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Stop checking for dm_cache_mq policy with cache target 1.9 (alias to smq). Check first /sys/module/dm_* dir existance before using modprobe. Remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0). diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c index a65892e..be9a57e 100644 --- a/lib/cache_segtype/cache.c +++ b/lib/cache_segtype/cache.c @@ -211,8 +211,9 @@ static int _target_present(struct cmd_context *cmd, const char feature[12]; const char module[12]; /* check dm-%s */ } _features[] = { - { 1, 3, CACHE_FEATURE_POLICY_MQ, "policy_mq", "cache-mq" }, + { 1, 9, CACHE_FEATURE_POLICY_SMQ | CACHE_FEATURE_POLICY_MQ, "policy_smq", "cache-smq" }, { 1, 8, CACHE_FEATURE_POLICY_SMQ, "policy_smq", "cache-smq" }, + { 1, 3, CACHE_FEATURE_POLICY_MQ, "policy_mq", "cache-mq" }, }; static const char _lvmconf[] = "global/cache_disabled_features"; static unsigned _attrs = 0; @@ -249,7 +250,9 @@ static int _target_present(struct cmd_context *cmd, for (i = 0; i < DM_ARRAY_SIZE(_features); ++i) { if (((maj > _features[i].maj) || (maj == _features[i].maj && min >= _features[i].min)) && - (!_features[i].module[0] || module_present(cmd, _features[i].module))) + (!_features[i].module[0] || + (_attrs & _features[i].cache_feature) || /* already present */ + module_present(cmd, _features[i].module))) _attrs |= _features[i].cache_feature; else log_very_verbose("Target %s does not support %s.",

1 0

master - modprobe: check /sys/module entry first
by Zdenek Kabelac 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=aa91fe3d3c3e6c2d… Commit: aa91fe3d3c3e6c2d8d96f5c0766b58375a44daa9 Parent: ecae76c713bd4fa6c9d8f2a2c990625e4f38b504 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Apr 26 21:41:04 2016 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Apr 26 23:23:03 2016 +0200 modprobe: check /sys/module entry first Before executing modprobe for given module name, just check if the module is not already present in /sys/module. Useful when checking dm-cache-policy modules as we do not having matching interface like for targets. --- WHATS_NEW | 1 + lib/activate/activate.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 1aa335e..2a4fdd5 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Check first /sys/module/dm_* dir existance before using modprobe. Remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0). Version 2.02.151 - 23rd April 2016 diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 76afc3d..f554f19 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -603,7 +603,24 @@ int module_present(struct cmd_context *cmd, const char *target_name) #ifdef MODPROBE_CMD char module[128]; const char *argv[] = { MODPROBE_CMD, module, NULL }; +#endif + struct stat st; + char path[PATH_MAX]; + int i = dm_snprintf(path, (sizeof(path) - 1), "%smodule/dm_%s", + dm_sysfs_dir(), target_name); + + if (i > 0) { + while (path[--i] != '/') /* stop on dm_ */ + if (path[i] == '-') + path[i] = '_'; /* replace '-' with '_' */ + + if ((lstat(path, &st) == 0) && S_ISDIR(st.st_mode)) { + log_debug("Module directory %s exists.", path); + return 1; + } + } +#ifdef MODPROBE_CMD if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) { log_error("module_present module name too long: %s", target_name);

1 0

master - udev: rules: add comments explaining subsystem-specific rules
by Peter Rajnoha 26 Apr '16

26 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ecae76c713bd4fa6… Commit: ecae76c713bd4fa6c9d8f2a2c990625e4f38b504 Parent: 2bb33aaf556134b0217b822755383245ac678527 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Apr 26 12:51:06 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Apr 26 12:57:37 2016 +0200 udev: rules: add comments explaining subsystem-specific rules --- udev/10-dm.rules.in | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in index 8d7a8ca..b4fa52a 100644 --- a/udev/10-dm.rules.in +++ b/udev/10-dm.rules.in @@ -13,6 +13,20 @@ # DM_UUID - UUID set for DM device (blank if not specified) # DM_SUSPENDED - suspended state of DM device (0 or 1) # DM_UDEV_RULES_VSN - DM udev rules version +# +# These rules cover only basic device-mapper functionality in udev. +# +# Various DM subsystems may contain further subsystem-specific rules +# in 11-dm-<subsystem_name>.rules which should be installed together +# with the DM subsystem and which extend these basic rules. +# For example: +# 11-dm-lvm.rules for LVM subsystem +# 11-dm-mpath.rules for multipath subsystem (since version 0.6.0, recommended!) +# +# Even more specific rules may be required by subsystems so always +# check subsystem's upstream repository for recent set of rules. +# Also, keep in mind that recent rules may also require recent +# subsystem-specific binaries. KERNEL=="device-mapper", NAME="(DM_DIR)/control"

1 0

master - udev: rules: remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0)
by Peter Rajnoha 25 Apr '16

25 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2bb33aaf556134b0… Commit: 2bb33aaf556134b0217b822755383245ac678527 Parent: 379874a2d0ff51cdbfbc1cc723b41e06bcdfd277 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Apr 25 14:48:46 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Apr 25 14:55:54 2016 +0200 udev: rules: remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0) Multipath 0.6.0 contains new 11-dm-mpath.rules which supersede the rule that was in 10-dm.rules. The 11-dm-mpath.rules are also more complete, fixing several other issues. Using the new 11-dm-mpath.rules from multipath-tools >= 0.6.0 is strongly recommended for proper DM multipath functionality! See also: http://christophe.varoqui.free.fr http://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=blob;f=multipath… --- WHATS_NEW | 1 + udev/10-dm.rules.in | 4 ---- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 961bae7..1aa335e 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.152 - ================================== + Remove mpath from 10-dm.rules, superseded by 11-dm-mpath.rules (mpath>=0.6.0). Version 2.02.151 - 23rd April 2016 ================================== diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in index 2755530..8d7a8ca 100644 --- a/udev/10-dm.rules.in +++ b/udev/10-dm.rules.in @@ -120,10 +120,6 @@ ENV{DM_UDEV_RULES_VSN}="2" ENV{DM_UDEV_DISABLE_DM_RULES_FLAG}!="1", ENV{DM_NAME}=="?*", SYMLINK+="(DM_DIR)/$env{DM_NAME}" -# We have to ignore further rule application for inappropriate events -# and devices. But still send the notification if cookie exists. -ENV{DM_UUID}=="mpath-?*", ENV{DM_ACTION}=="PATH_FAILED", GOTO="dm_disable" - # Avoid processing and scanning a DM device in the other (foreign) # rules if it is in suspended state. However, we still keep 'disk' # and 'DM subsystem' related rules enabled in this case.

1 0

master - cleanup: do not mention segment in warning message if device not found for a PV when checking used/assumed devs for an LV
by Peter Rajnoha 25 Apr '16

25 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=379874a2d0ff51cd… Commit: 379874a2d0ff51cdbfbc1cc723b41e06bcdfd277 Parent: 9d976c0002f06e97c50bca7dad35d647848ed60f Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Apr 25 11:41:36 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Apr 25 11:44:24 2016 +0200 cleanup: do not mention segment in warning message if device not found for a PV when checking used/assumed devs for an LV [0] fedora/~ # pvs --config 'devices/filter=["a|/dev/sda|", "r|.*|"]' WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. WARNING: Couldn't find device for segment belonging to fedora/root while checking used and assumed devices. WARNING: Couldn't find device for segment belonging to fedora/swap while checking used and assumed devices. PV VG Fmt Attr PSize PFree /dev/sda lvm2 --- 128.00m 128.00m [unknown] fedora lvm2 a-m 19.49g 0 Probably not worth mentioning "segments" here, just state that devices for an LV can't be all found during the check - it's less mysterious for user then: [0] fedora/~ # pvs --config 'devices/filter=["a|/dev/sda|", "r|.*|"]' WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. WARNING: Couldn't find all devices for LV fedora/root while checking used and assumed devices. WARNING: Couldn't find all devices for LV fedora/swap while checking used and assumed devices. PV VG Fmt Attr PSize PFree /dev/sda lvm2 --- 128.00m 128.00m [unknown] fedora lvm2 a-m 19.49g 0 --- lib/metadata/metadata.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 1ceed68..6d101e0 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4631,8 +4631,8 @@ static int _check_devs_used_correspond_with_lv(struct dm_pool *mem, struct dm_li if (seg_type(seg, s) == AREA_PV) { if (!(dev = seg_dev(seg, s))) { if (!warned_about_no_dev) { - log_warn("WARNING: Couldn't find device for segment belonging " - "to %s while checking used and assumed devices.", + log_warn("WARNING: Couldn't find all devices for LV %s " + "while checking used and assumed devices.", display_lvname(lv)); warned_about_no_dev = 1; }

1 0

master - metadata: log warning instead of error if device not found while checking used and assumed devs
by Peter Rajnoha 25 Apr '16

25 Apr '16

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9d976c0002f06e97… Commit: 9d976c0002f06e97c50bca7dad35d647848ed60f Parent: eb8edccd58a4ac2b313800f4d1839df336e3cab9 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Apr 25 11:15:44 2016 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Apr 25 11:27:28 2016 +0200 metadata: log warning instead of error if device not found while checking used and assumed devs When checking assumed PVs against real devices used for LVs and if there's no device assigned for an assumed PV (e.g. due to filters), do log_warn instead of log_error and continue checking LV segments and associated assumed PVs further, just like we do log_warn elsewhere in this situation. This way user will see the warning for each LV which couldn't be checked completely against real PVs used. Before, we logged only the very first occurence of missing device for an LV in a VG and we returned from the function doing this check for all the LVs in VG immediately which may be a bit misleading because it didn't tell user about all the other LVs and whether they could be checked or not. For example, we have this setup: [0] fedora/~ # pvs PV VG Fmt Attr PSize PFree /dev/sda lvm2 --- 128.00m 128.00m /dev/vda2 fedora lvm2 a-- 19.49g 0 [0] fedora/~ # lvs -o+devices LV VG Attr LSize Devices root fedora -wi-ao---- 19.00g /dev/vda2(0) swap fedora -wi-ao---- 500.00m /dev/vda2(4864) Before this patch (only the very first LV in a VG is logged to have a problem while checking used and assumed devices): [0] fedora/~ # pvs --config 'devices/filter=["a|/dev/sda|", "r|.*|"]' WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. Couldn't find device for segment belonging to fedora/root while checking used and assumed devices. PV VG Fmt Attr PSize PFree /dev/sda lvm2 --- 128.00m 128.00m [unknown] fedora lvm2 a-m 19.49g 0 With this patch applied (all LVs where we hit problem while checking used and assumed devices are logged and it's warning, not error): [0] fedora/~ # pvs --config 'devices/filter=["a|/dev/sda|", "r|.*|"]' WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. WARNING: Device for PV Qcxpcy-XgtP-UD3s-PmG0-qLyE-Z0ho-DYsxoz not found or rejected by a filter. WARNING: Couldn't find device for segment belonging to fedora/root while checking used and assumed devices. WARNING: Couldn't find device for segment belonging to fedora/swap while checking used and assumed devices. PV VG Fmt Attr PSize PFree /dev/sda lvm2 --- 128.00m 128.00m [unknown] fedora lvm2 a-m 19.49g 0 --- lib/metadata/metadata.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index f9ce080..1ceed68 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4597,6 +4597,7 @@ static int _check_devs_used_correspond_with_lv(struct dm_pool *mem, struct dm_li struct device *dev; struct lv_segment *seg; uint32_t s; + int warned_about_no_dev = 0; char *used_devnames = NULL, *assumed_devnames = NULL; if (!(list = dev_cache_get_dev_list_for_lvid(lv->lvid.s + ID_LEN))) @@ -4629,10 +4630,13 @@ static int _check_devs_used_correspond_with_lv(struct dm_pool *mem, struct dm_li for (s = 0; s < seg->area_count; s++) { if (seg_type(seg, s) == AREA_PV) { if (!(dev = seg_dev(seg, s))) { - log_error("Couldn't find device for segment belonging to " - "%s while checking used and assumed devices.", - display_lvname(lv)); - return 0; + if (!warned_about_no_dev) { + log_warn("WARNING: Couldn't find device for segment belonging " + "to %s while checking used and assumed devices.", + display_lvname(lv)); + warned_about_no_dev = 1; + } + continue; } if (!(dev->flags & DEV_USED_FOR_LV)) { if (!found_inconsistent) { @@ -4653,11 +4657,10 @@ static int _check_devs_used_correspond_with_lv(struct dm_pool *mem, struct dm_li if (!dm_pool_grow_object(mem, "\0", 1)) return_0; assumed_devnames = dm_pool_end_object(mem); + log_warn("WARNING: Device mismatch detected for %s which is accessing %s instead of %s.", + display_lvname(lv), used_devnames, assumed_devnames); } - log_warn("WARNING: Device mismatch detected for %s which is accessing %s instead of %s.", - display_lvname(lv), used_devnames, assumed_devnames); - return 1; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits April 2016