lvm2-commits November 2014

lvm2-commits@lists.fedorahosted.org

5 participants
192 discussions

master - cleanup: shorter code
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ce7f06cf4e621472… Commit: ce7f06cf4e62147293678c0baf0c86c45e8b4549 Parent: 1b439a0b8e6fc99bcc66fe74c8675ceb4ab430d2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Oct 31 13:36:54 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:34 2014 +0100 cleanup: shorter code --- tools/lvcreate.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/lvcreate.c b/tools/lvcreate.c index f6786a8..cf2a07c 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -577,7 +577,7 @@ static int _read_activation_params(struct cmd_context *cmd, struct volume_group *vg, struct lvcreate_params *lp) { - unsigned pagesize; + unsigned pagesize = lvm_getpagesize() >> SECTOR_SHIFT; lp->activate = (activation_change_t) arg_uint_value(cmd, activate_ARG, CHANGE_AY); @@ -585,7 +585,6 @@ static int _read_activation_params(struct cmd_context *cmd, /* Read ahead */ lp->read_ahead = arg_uint_value(cmd, readahead_ARG, cmd->default_settings.read_ahead); - pagesize = lvm_getpagesize() >> SECTOR_SHIFT; if (lp->read_ahead != DM_READ_AHEAD_AUTO && lp->read_ahead != DM_READ_AHEAD_NONE && lp->read_ahead % pagesize) {

1 0

master - cleanup: rename function
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1b439a0b8e6fc99b… Commit: 1b439a0b8e6fc99bcc66fe74c8675ceb4ab430d2 Parent: 228e7ff767b916a033da6d83cfa6970c5cfaba00 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Nov 2 20:59:57 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:34 2014 +0100 cleanup: rename function Make more clear dm_info type. --- lib/activate/dev_manager.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 7b43e09..266c80a 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -543,10 +543,10 @@ out: return r; } -static const struct dm_info *_cached_info(struct dm_pool *mem, - struct dm_tree *dtree, - const struct logical_volume *lv, - const char *layer) +static const struct dm_info *_cached_dm_info(struct dm_pool *mem, + struct dm_tree *dtree, + const struct logical_volume *lv, + const char *layer) { char *dlid; const struct dm_tree_node *dnode; @@ -1925,7 +1925,7 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, if (!dm->activation) { /* Setup callback for non-activation partial tree */ /* Activation gets own callback when needed */ - /* TODO: extend _cached_info() to return dnode */ + /* TODO: extend _cached_dm_info() to return dnode */ if (!(uuid = build_dm_uuid(dm->mem, lv, lv_layer(lv)))) return_0; if ((node = dm_tree_find_node_by_uuid(dtree, uuid)) && @@ -1938,7 +1938,7 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, if (!dm->activation) { /* Setup callback for non-activation partial tree */ /* Activation gets own callback when needed */ - /* TODO: extend _cached_info() to return dnode */ + /* TODO: extend _cached_dm_info() to return dnode */ if (!(uuid = build_dm_uuid(dm->mem, lv, lv_layer(lv)))) return_0; if ((node = dm_tree_find_node_by_uuid(dtree, uuid)) && @@ -2409,8 +2409,8 @@ static int _add_new_external_lv_to_dtree(struct dev_manager *dm, dm_list_iterate_items(sl, &external_lv->segs_using_this_lv) if ((sl->seg->external_lv == external_lv) && /* Add only active layered devices (also avoids loop) */ - _cached_info(dm->mem, dtree, sl->seg->lv, - lv_layer(sl->seg->lv)) && + _cached_dm_info(dm->mem, dtree, sl->seg->lv, + lv_layer(sl->seg->lv)) && !_add_new_lv_to_dtree(dm, dtree, sl->seg->lv, laopts, lv_layer(sl->seg->lv))) return_0; @@ -2585,11 +2585,11 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, * so just use the tree's existing nodes' info */ /* An activating merging origin won't have a node in the tree yet */ - if (((dinfo = _cached_info(dm->mem, dtree, lv, NULL)) && + if (((dinfo = _cached_dm_info(dm->mem, dtree, lv, NULL)) && dinfo->open_count) || - ((dinfo = _cached_info(dm->mem, dtree, - seg_is_thin_volume(seg) ? - seg->lv : seg->cow, NULL)) && + ((dinfo = _cached_dm_info(dm->mem, dtree, + seg_is_thin_volume(seg) ? + seg->lv : seg->cow, NULL)) && dinfo->open_count)) { if (seg_is_thin_volume(seg) || /* FIXME Is there anything simpler to check for instead? */

1 0

master - cleanup: standard params ordering
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=228e7ff767b916a0… Commit: 228e7ff767b916a033da6d83cfa6970c5cfaba00 Parent: a0f7d6e36a27a3fc38307ae726583cc2e4c2a105 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Oct 31 11:31:22 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:34 2014 +0100 cleanup: standard params ordering Pass lvconvert_params as last arg. --- tools/lvconvert.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index f2eb5f5..22058ea 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -231,8 +231,8 @@ static int _mirror_or_raid_type_requested(struct cmd_context *cmd, const char *t return (arg_count(cmd, mirrors_ARG) || !strncmp(type_str, "raid", 4) || !strcmp(type_str, "mirror")); } -static int _read_pool_params(struct lvconvert_params *lp, struct cmd_context *cmd, - const char *type_str, int *pargc, char ***pargv) +static int _read_pool_params(struct cmd_context *cmd, int *pargc, char ***pargv, + const char *type_str, struct lvconvert_params *lp) { int cachepool = 0; int thinpool = 0; @@ -339,8 +339,8 @@ static int _read_pool_params(struct lvconvert_params *lp, struct cmd_context *cm return 1; } -static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd, - int argc, char **argv) +static int _read_params(struct cmd_context *cmd, int argc, char **argv, + struct lvconvert_params *lp) { int i; const char *tmp_str; @@ -447,7 +447,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd, type_str = "thin"; } - if (!_read_pool_params(lp, cmd, type_str, &argc, &argv)) + if (!_read_pool_params(cmd, &argc, &argv, type_str, lp)) return_0; if (!arg_count(cmd, background_ARG)) @@ -3509,7 +3509,7 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv) .target_attr = ~0, }; - if (!_read_params(&lp, cmd, argc, argv)) { + if (!_read_params(cmd, argc, argv, &lp)) { stack; return EINVALID_CMD_LINE; }

1 0

master - cleanup: init of lcp
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a0f7d6e36a27a3fc… Commit: a0f7d6e36a27a3fc38307ae726583cc2e4c2a105 Parent: d6c5445bea45de548bb16378030cd4f381bf4c04 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Oct 31 10:25:05 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:34 2014 +0100 cleanup: init of lcp Use struct initializer instead of memset(). --- tools/lvcreate.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 2cbfbe5..f6786a8 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -346,7 +346,7 @@ static int _update_extents_params(struct volume_group *vg, (vg->free_count < lp->extents - size_rest + (lp->stripes * stripesize_extents))) { log_print_unless_silent("Rounding size (%d extents) down to stripe boundary " "size (%d extents)", lp->extents, - lp->extents - size_rest); + lp->extents - size_rest); lp->extents = lp->extents - size_rest; } @@ -625,7 +625,6 @@ static int _lvcreate_params(struct cmd_context *cmd, int only_linear = 0; int mirror_default_cfg; - memset(lcp, 0, sizeof(*lcp)); dm_list_init(&lp->tags); lp->target_attr = ~0; lp->yes = arg_count(cmd, yes_ARG); @@ -1413,7 +1412,7 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv) .major = -1, .minor = -1, }; - struct lvcreate_cmdline_params lcp; + struct lvcreate_cmdline_params lcp = { 0 }; struct volume_group *vg; if (!_lvcreate_params(cmd, argc, argv, &lp, &lcp)) {

1 0

master - cleanup: correcting tracing
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d6c5445bea45de54… Commit: d6c5445bea45de548bb16378030cd4f381bf4c04 Parent: d574072dd8eb11f54c2f9835e49da5b193cdfca7 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 3 12:52:24 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:34 2014 +0100 cleanup: correcting tracing Use log_error for real error. --- lib/activate/dev_manager.c | 6 +++--- lib/metadata/cache_manip.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 9272742..7b43e09 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -558,7 +558,7 @@ static const struct dm_info *_cached_info(struct dm_pool *mem, } if (!(dnode = dm_tree_find_node_by_uuid(dtree, dlid))) - goto out; + goto_out; if (!(dinfo = dm_tree_node_get_info(dnode))) { log_error("Failed to get info from tree node for %s.", lv->name); @@ -1099,7 +1099,7 @@ int dev_manager_raid_status(struct dev_manager *dm, dm_get_next_target(dmt, NULL, &start, &length, &type, &params); if (!type || strcmp(type, "raid")) { - log_debug("Expected raid segment type but got %s instead", + log_error("Expected raid segment type but got %s instead", type ? type : "NULL"); goto out; } @@ -1193,7 +1193,7 @@ int dev_manager_cache_status(struct dev_manager *dm, dm_get_next_target(dmt, NULL, &start, &length, &type, &params); if (!type || strcmp(type, "cache")) { - log_debug("Expected cache segment type but got %s instead", + log_error("Expected cache segment type but got %s instead", type ? type : "NULL"); goto out; } diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index a9f21ad..ec7f444 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -241,7 +241,8 @@ int lv_cache_remove(struct logical_volume *cache_lv) struct lv_status_cache *status; if (!lv_is_cache(cache_lv)) { - log_error(INTERNAL_ERROR "LV %s is not cached.", cache_lv->name); + log_error(INTERNAL_ERROR "LV %s is not cache volume.", + display_lvname(cache_lv)); return 0; } @@ -291,7 +292,7 @@ int lv_cache_remove(struct logical_volume *cache_lv) /* update the kernel to put the cleaner policy in place */ if (!lv_update_and_reload(cache_lv)) - return_0; + return_0; } //FIXME: use polling to do this...

1 0

master - cleanup: use arg_is_set
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d574072dd8eb11f5… Commit: d574072dd8eb11f54c2f9835e49da5b193cdfca7 Parent: ca9482b276c4a74021d158e4b9c8e8a18dd50e35 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Oct 31 11:41:03 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:33 2014 +0100 cleanup: use arg_is_set --- tools/toollib.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/toollib.c b/tools/toollib.c index 0472597..5906ccb 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -978,13 +978,12 @@ int get_pool_params(struct cmd_context *cmd, *passed_args = 0; if (segtype_is_thin_pool(segtype) || segtype_is_thin(segtype)) { - if (arg_count(cmd, zero_ARG)) { + if (arg_is_set(cmd, zero_ARG)) { *passed_args |= PASS_ARG_ZERO; *zero = arg_int_value(cmd, zero_ARG, 1); log_very_verbose("Setting pool zeroing: %u", *zero); } - - if (arg_count(cmd, discards_ARG)) { + if (arg_is_set(cmd, discards_ARG)) { *passed_args |= PASS_ARG_DISCARDS; *discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, 0); log_very_verbose("Setting pool discards: %s",

1 0

master - cache: report stats for cache volumes usage
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ca9482b276c4a740… Commit: ca9482b276c4a74021d158e4b9c8e8a18dd50e35 Parent: b7bc28b7b7dfdcaf6be9f3d8050994d2df35d3e9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 3 12:38:29 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:33 2014 +0100 cache: report stats for cache volumes usage Show some stats with 'lvs' Display same info for active cache volume and cache-pool. data% - #used cache blocks/#total cache blocks meta% - #used metadata blocks/#total metadata blocks copy% - #dirty/#used cache blocks TODO: maybe there is a better mapping - should be seen as first-try-and-see. --- WHATS_NEW | 1 + lib/report/properties.c | 29 +++++++++++++++++++++++++++-- lib/report/report.c | 23 +++++++++++++++++++++-- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index bb8cd8d..d824289 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.112 - ===================================== + Report some basic percentage info for cache pools. Introduce size_mb_arg_with_percent() for advanced size arg reading. Add extra support for '.' as decimal point in size args. Configurable support for creation of sparse volumes with thin-pools. diff --git a/lib/report/properties.c b/lib/report/properties.c index 8f4f472..3389087 100644 --- a/lib/report/properties.c +++ b/lib/report/properties.c @@ -104,10 +104,21 @@ static dm_percent_t _snap_percent(const struct logical_volume *lv) static dm_percent_t _data_percent(const struct logical_volume *lv) { dm_percent_t percent; + struct lv_status_cache *status; if (lv_is_cow(lv)) return _snap_percent(lv); + if (lv_is_cache(lv) || lv_is_cache_pool(lv)) { + if (!lv_cache_status(lv, &status)) { + stack; + return DM_PERCENT_INVALID; + } + percent = status->dirty_usage; + dm_pool_destroy(status->mem); + return percent; + } + if (lv_is_thin_volume(lv)) return lv_thin_percent(lv, 0, &percent) ? percent : DM_PERCENT_INVALID; @@ -117,8 +128,22 @@ static dm_percent_t _data_percent(const struct logical_volume *lv) static dm_percent_t _metadata_percent(const struct logical_volume *lv) { dm_percent_t percent; - - return lv_thin_pool_percent(lv, 1, &percent) ? percent : DM_PERCENT_INVALID; + struct lv_status_cache *status; + + if (lv_is_cache(lv) || lv_is_cache_pool(lv)) { + if (!lv_cache_status(lv, &status)) { + stack; + return DM_PERCENT_INVALID; + } + percent = status->dirty_usage; + dm_pool_destroy(status->mem); + return percent; + } + + if (lv_is_thin_pool(lv)) + return lv_thin_pool_percent(lv, 1, &percent) ? percent : DM_PERCENT_INVALID; + + return DM_PERCENT_INVALID; } /* PV */ diff --git a/lib/report/report.c b/lib/report/report.c index f2ed0ae..c74bbfa 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2013 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. * @@ -1057,13 +1057,18 @@ static int _copypercent_disp(struct dm_report *rh, const void *data, void *private __attribute__((unused))) { const struct logical_volume *lv = (const struct logical_volume *) data; + struct lv_status_cache *status; dm_percent_t percent = DM_PERCENT_INVALID; if (((lv_is_raid(lv) && lv_raid_percent(lv, &percent)) || (lv_is_mirror(lv) && lv_mirror_percent(lv->vg->cmd, lv, 0, &percent, NULL))) && (percent != DM_PERCENT_INVALID)) { percent = copy_percent(lv); - return dm_report_field_percent(rh, field, &percent); + } else if (lv_is_cache(lv) || lv_is_cache_pool(lv)) { + if (lv_cache_status(lv, &status)) { + percent = status->dirty_usage; + dm_pool_destroy(status->mem); + } } return dm_report_field_percent(rh, field, &percent); @@ -1149,6 +1154,7 @@ static int _datapercent_disp(struct dm_report *rh, struct dm_pool *mem, { const struct logical_volume *lv = (const struct logical_volume *) data; dm_percent_t percent = DM_PERCENT_INVALID; + struct lv_status_cache *status; if (lv_is_cow(lv)) return _snpercent_disp(rh, mem, field, data, private); @@ -1156,6 +1162,12 @@ static int _datapercent_disp(struct dm_report *rh, struct dm_pool *mem, (void) lv_thin_pool_percent(lv, 0, &percent); else if (lv_is_thin_volume(lv)) (void) lv_thin_percent(lv, 0, &percent); + else if (lv_is_cache(lv) || lv_is_cache_pool(lv)) { + if (lv_cache_status(lv, &status)) { + percent = status->data_usage; + dm_pool_destroy(status->mem); + } + } return dm_report_field_percent(rh, field, &percent); } @@ -1167,11 +1179,18 @@ static int _metadatapercent_disp(struct dm_report *rh, { const struct logical_volume *lv = (const struct logical_volume *) data; dm_percent_t percent = DM_PERCENT_INVALID; + struct lv_status_cache *status; if (lv_is_thin_pool(lv)) (void) lv_thin_pool_percent(lv, 1, &percent); else if (lv_is_thin_volume(lv)) (void) lv_thin_percent(lv, 1, &percent); + else if (lv_is_cache(lv) || lv_is_cache_pool(lv)) { + if (lv_cache_status(lv, &status)) { + percent = status->metadata_usage; + dm_pool_destroy(status->mem); + } + } return dm_report_field_percent(rh, field, &percent); }

1 0

master - cache: wipe cache-pool before reuse
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b7bc28b7b7dfdcaf… Commit: b7bc28b7b7dfdcaf6be9f3d8050994d2df35d3e9 Parent: 29bd3cccc8de8949754edfe3d5a4c490627d5fa5 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Nov 2 19:41:46 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:33 2014 +0100 cache: wipe cache-pool before reuse Before we reuse cache-pool - we need to ensure metadata volume has wiped header. --- lib/metadata/lv_manip.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index a42a7f5..b5fc84a 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6678,6 +6678,10 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg, lp->extents = size; } } + + if (seg_is_cache(lp) && + !wipe_cache_pool(pool_lv)) + return_NULL; } /* Resolve origin volume */

1 0

master - cache: support activation of empty cache-pool
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=29bd3cccc8de8949… Commit: 29bd3cccc8de8949754edfe3d5a4c490627d5fa5 Parent: ab491204659ef08a9a71379cab835650901b31ac Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Nov 2 19:34:50 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:33 2014 +0100 cache: support activation of empty cache-pool When the cache pool is unused, lvm2 code will internally allow to activate such cache-pool. Cache-pool is activate as metadata LV, so lvm2 could easily wipe such volume before cache-pool is reused. --- lib/activate/dev_manager.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index e9b6816..9272742 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1867,12 +1867,15 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, const char *uuid; if (lv_is_cache_pool(lv)) { - /* origin_only is ignored */ - /* cache pool is 'meta' LV and does not have a real device node */ - if (!_add_lv_to_dtree(dm, dtree, seg_lv(first_seg(lv), 0), 0)) - return_0; - if (!_add_lv_to_dtree(dm, dtree, first_seg(lv)->metadata_lv, 0)) - return_0; + if (!dm_list_empty(&lv->segs_using_this_lv)) { + /* origin_only is ignored */ + /* cache pool is 'meta' LV and does not have a real device node */ + if (!_add_lv_to_dtree(dm, dtree, seg_lv(first_seg(lv), 0), 0)) + return_0; + if (!_add_lv_to_dtree(dm, dtree, first_seg(lv)->metadata_lv, 0)) + return_0; + } else if (!_add_dev_to_dtree(dm, dtree, lv, NULL)) + return_0; /* For internal use - empty pool makes meta visible */ return 1; } @@ -2560,7 +2563,8 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, uint32_t read_ahead = lv->read_ahead; uint32_t read_ahead_flags = UINT32_C(0); - if (lv_is_cache_pool(lv)) { + if (lv_is_cache_pool(lv) && + !dm_list_empty(&lv->segs_using_this_lv)) { /* cache pool is 'meta' LV and does not have a real device node */ if (!_add_new_lv_to_dtree(dm, dtree, seg_lv(first_seg(lv), 0), laopts, NULL)) return_0; @@ -2637,6 +2641,10 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, /* Create table */ dm->pvmove_mirror_count = 0u; + /* This is unused cache-pool - make metadata accessible */ + if (lv_is_cache_pool(lv)) + lv = first_seg(lv)->metadata_lv; + /* If this is a snapshot origin, add real LV */ /* If this is a snapshot origin + merging snapshot, add cow + real LV */ /* Snapshot origin could be also external origin */ @@ -2853,7 +2861,7 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv, /* Some LV can be used for top level tree */ /* TODO: add more.... */ - if (lv_is_cache_pool(lv)) { + if (lv_is_cache_pool(lv) && !dm_list_empty(&lv->segs_using_this_lv)) { log_error(INTERNAL_ERROR "Cannot create tree for %s.", lv->name); return 0; }

1 0

master - cache: lv_cache_status
by Zdenek Kabelac 03 Nov '14

03 Nov '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ab491204659ef08a… Commit: ab491204659ef08a9a71379cab835650901b31ac Parent: 13e6369d7f3b44b50e583e48868fb075a9f31757 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 3 12:52:29 2014 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Mon Nov 3 14:19:33 2014 +0100 cache: lv_cache_status Replace lv_cache_block_info() and lv_cache_policy_info() with lv_cache_status() which directly returns dm_status_cache structure together with some calculated values. After use mem pool stored inside lv_status_cache structure needs to be destroyed. --- lib/activate/activate.c | 151 ++++---------------------------------- lib/activate/activate.h | 8 +-- lib/activate/dev_manager.c | 24 +++++- lib/activate/dev_manager.h | 2 +- lib/metadata/cache_manip.c | 21 +++-- lib/metadata/metadata-exported.h | 8 ++ 6 files changed, 60 insertions(+), 154 deletions(-) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 69011f7..49e86e7 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -968,158 +968,39 @@ out: return r; } -int lv_cache_block_info(struct logical_volume *lv, - uint32_t *chunk_size, uint64_t *dirty_count, - uint64_t *used_count, uint64_t *total_count) +/* + * Return dm_status_cache for cache volume, accept also cache pool + * + * As there are too many variable for cache volumes, and it hard + * to make good API - so let's obtain dm_status_cache and return + * all info we have - user just has to release struct after its use. + */ +int lv_cache_status(const struct logical_volume *cache_lv, + struct lv_status_cache **status) { - struct lv_segment *cache_seg; - struct logical_volume *cache_lv; struct dev_manager *dm; - struct dm_status_cache *status; - - /* The user is free to choose which args they are interested in */ - if (chunk_size) - *chunk_size = 0; - if (dirty_count) - *dirty_count = 0; - if (used_count) - *used_count = 0; - if (total_count) - *total_count = 0; - - if (lv_is_cache(lv)) - cache_lv = lv; - else if (lv_is_cache_pool(lv)) { - if (dm_list_empty(&lv->segs_using_this_lv)) { - //FIXME: Ok to return value not sourced from kernel? - // This could be valuable - esp for 'lvs' output - log_error(INTERNAL_ERROR "Unable to get block info" - " of unlinked cache_pool, %s", lv->name); - //FIXME: ... because we could do this: - if (chunk_size) - *chunk_size = first_seg(lv)->chunk_size; - /* Unlinked cache_pools have 0 dirty & used blocks */ - if (total_count) { - *total_count = lv->size; /* in sectors */ - *total_count /= first_seg(lv)->chunk_size; - } - - return 1; - } - if (!(cache_seg = get_only_segment_using_this_lv(lv))) - return_0; - cache_lv = cache_seg->lv; - } else { - log_error(INTERNAL_ERROR - "Unable to get block info of non-cache LV, %s", - lv->name); - return 0; - } - - if (!lv_info(cache_lv->vg->cmd, cache_lv, 0, NULL, 0, 0)) - return_0; - - log_debug_activation("Checking cache block info for LV %s/%s", - cache_lv->vg->name, cache_lv->name); - - if (!(dm = dev_manager_create(cache_lv->vg->cmd, cache_lv->vg->name, 1))) - return_0; - - if (!dev_manager_cache_status(dm, cache_lv, &status)) { - dev_manager_destroy(dm); - return_0; - } - - if (chunk_size) - *chunk_size = status->block_size; - if (dirty_count) - *dirty_count = status->dirty_blocks; - if (used_count) - *used_count = status->used_blocks; - if (total_count) - *total_count = status->total_blocks; - - dev_manager_destroy(dm); - - return 1; -} - -int lv_cache_policy_info(struct logical_volume *lv, - const char **policy_name, int *policy_argc, - const char ***policy_argv) -{ - int i; struct lv_segment *cache_seg; - struct logical_volume *cache_lv; - struct dev_manager *dm; - struct dm_status_cache *status; - struct dm_pool *mem = lv->vg->cmd->mem; - - /* The user is free to choose which args they are interested in */ - if (policy_name) - *policy_name = NULL; - if (policy_argc) - *policy_argc = 0; - if (policy_argv) - *policy_argv = NULL; - - if (lv_is_cache(lv)) - cache_lv = lv; - else if (lv_is_cache_pool(lv)) { - if (dm_list_empty(&lv->segs_using_this_lv)) { - //FIXME: Ok to return value not sourced from kernel? - log_error(INTERNAL_ERROR "Unable to get policy info" - " of unlinked cache_pool, %s", lv->name); - //FIXME: ... because we could do this: - if (policy_name) - *policy_name = first_seg(lv)->policy_name; - if (policy_argc) - *policy_argc = first_seg(lv)->policy_argc; - if (policy_argv) - *policy_argv = first_seg(lv)->policy_argv; - return 1; - } - if (!(cache_seg = get_only_segment_using_this_lv(lv))) + if (lv_is_cache_pool(cache_lv) && !dm_list_empty(&cache_lv->segs_using_this_lv)) { + if (!(cache_seg = get_only_segment_using_this_lv(cache_lv))) return_0; cache_lv = cache_seg->lv; - } else { - log_error(INTERNAL_ERROR - "Unable to get policy info of non-cache LV, %s", - lv->name); - return 0; } if (!lv_info(cache_lv->vg->cmd, cache_lv, 0, NULL, 0, 0)) - return_0; + return 0; - log_debug_activation("Checking cache policy for LV %s/%s", - cache_lv->vg->name, cache_lv->name); + log_debug_activation("Checking cache status for LV %s.", + display_lvname(cache_lv)); if (!(dm = dev_manager_create(cache_lv->vg->cmd, cache_lv->vg->name, 1))) return_0; - if (!dev_manager_cache_status(dm, cache_lv, &status)) { + if (!dev_manager_cache_status(dm, cache_lv, status)) { dev_manager_destroy(dm); return_0; } - - if (policy_name && - !(*policy_name = dm_pool_strdup(mem, status->policy_name))) - return_0; - if (policy_argc) - *policy_argc = status->policy_argc; - if (policy_argv) { - if (!(*policy_argv = - dm_pool_zalloc(mem, sizeof(char *) * status->policy_argc))) - return_0; - for (i = 0; i < status->policy_argc; ++i) - if (!((*policy_argv)[i] = - dm_pool_strdup(mem, status->policy_argv[i]))) - return_0; - } - - dev_manager_destroy(dm); + /* User has to call dm_pool_destroy(status->mem)! */ return 1; } diff --git a/lib/activate/activate.h b/lib/activate/activate.h index 4c170c1..9dfbcfa 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -120,12 +120,8 @@ int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health); int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt); int lv_raid_sync_action(const struct logical_volume *lv, char **sync_action); int lv_raid_message(const struct logical_volume *lv, const char *msg); -int lv_cache_block_info(struct logical_volume *lv, - uint32_t *chunk_size, uint64_t *dirty_count, - uint64_t *used_count, uint64_t *total_count); -int lv_cache_policy_info(struct logical_volume *lv, - const char **policy_name, int *policy_argc, - const char ***policy_argv); +int lv_cache_status(const struct logical_volume *lv, + struct lv_status_cache **status); int lv_thin_pool_percent(const struct logical_volume *lv, int metadata, dm_percent_t *percent); int lv_thin_percent(const struct logical_volume *lv, int mapped, diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index b7e496e..e9b6816 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1164,7 +1164,7 @@ out: int dev_manager_cache_status(struct dev_manager *dm, const struct logical_volume *lv, - struct dm_status_cache **status) + struct lv_status_cache **status) { int r = 0; const char *dlid; @@ -1173,9 +1173,12 @@ int dev_manager_cache_status(struct dev_manager *dm, uint64_t start, length; char *type = NULL; char *params = NULL; - const char *layer = lv_layer(lv); + struct dm_status_cache *c; - if (!(dlid = build_dm_uuid(dm->mem, lv, layer))) + if (!(dlid = build_dm_uuid(dm->mem, lv, lv_layer(lv)))) + return_0; + + if (!(*status = dm_pool_zalloc(dm->mem, sizeof(struct lv_status_cache)))) return_0; if (!(dmt = _setup_task(NULL, dlid, 0, DM_DEVICE_STATUS, 0, 0, 0))) @@ -1195,9 +1198,22 @@ int dev_manager_cache_status(struct dev_manager *dm, goto out; } - if (!dm_get_status_cache(dm->mem, params, status)) + /* + * FIXME: + * ->target_percent() API is able to transfer only a single value. + * Needs to be able to pass whole structure. + */ + if (!dm_get_status_cache(dm->mem, params, &((*status)->cache))) goto_out; + c = (*status)->cache; + (*status)->mem = dm->mem; /* User can destroy this mem pool later */ + (*status)->data_usage = dm_make_percent(c->used_blocks, + c->total_blocks); + (*status)->metadata_usage = dm_make_percent(c->metadata_used_blocks, + c->metadata_total_blocks); + (*status)->dirty_usage = dm_make_percent(c->dirty_blocks, + c->used_blocks); r = 1; out: dm_task_destroy(dmt); diff --git a/lib/activate/dev_manager.h b/lib/activate/dev_manager.h index 8325bf9..f4f989c 100644 --- a/lib/activate/dev_manager.h +++ b/lib/activate/dev_manager.h @@ -62,7 +62,7 @@ int dev_manager_raid_message(struct dev_manager *dm, const char *msg); int dev_manager_cache_status(struct dev_manager *dm, const struct logical_volume *lv, - struct dm_status_cache **status); + struct lv_status_cache **status); int dev_manager_thin_pool_status(struct dev_manager *dm, const struct logical_volume *lv, struct dm_status_thin_pool **status, diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index eba7a50..a9f21ad 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -233,11 +233,12 @@ static int _cleanup_orphan_lv(struct logical_volume *lv) */ int lv_cache_remove(struct logical_volume *cache_lv) { - const char *policy_name; + 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; if (!lv_is_cache(cache_lv)) { log_error(INTERNAL_ERROR "LV %s is not cached.", cache_lv->name); @@ -271,10 +272,12 @@ int lv_cache_remove(struct logical_volume *cache_lv) * remove the cache_pool then without waiting for the flush to * complete. */ - if (!lv_cache_policy_info(cache_lv, &policy_name, NULL, NULL)) + if (!lv_cache_status(cache_lv, &status)) return_0; + is_cleaner = !strcmp(status->cache->policy_name, "cleaner"); + dm_pool_destroy(status->mem); - if (strcmp(policy_name, "cleaner")) { + if (!is_cleaner) { /* We must swap in the cleaner to flush the cache */ log_print_unless_silent("Flushing cache for %s.", cache_lv->name); @@ -293,13 +296,15 @@ int lv_cache_remove(struct logical_volume *cache_lv) //FIXME: use polling to do this... do { - if (!lv_cache_block_info(cache_lv, NULL, - &dirty_blocks, NULL, NULL)) + if (!lv_cache_status(cache_lv, &status)) return_0; - log_print_unless_silent("%" PRIu64 " blocks must still be flushed.", - dirty_blocks); - if (dirty_blocks) + dirty_blocks = status->cache->dirty_blocks; + dm_pool_destroy(status->mem); + if (dirty_blocks) { + log_print_unless_silent("%" PRIu64 " blocks must still be flushed.", + dirty_blocks); sleep(1); + } } while (dirty_blocks); cache_pool_lv = cache_seg->pool_lv; diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 39d91a1..736b0b5 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -1086,6 +1086,14 @@ int partial_raid_lv_supports_degraded_activation(const struct logical_volume *lv /* -- metadata/raid_manip.c */ /* ++ metadata/cache_manip.c */ +struct lv_status_cache { + struct dm_pool *mem; + struct dm_status_cache *cache; + dm_percent_t data_usage; + dm_percent_t metadata_usage; + dm_percent_t dirty_usage; +}; + const char *get_cachepool_cachemode_name(const struct lv_segment *seg); int update_cache_pool_params(const struct segment_type *segtype, struct volume_group *vg, unsigned attr,

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2014