lvm2-commits September 2015

lvm2-commits@lists.fedorahosted.org

7 participants
177 discussions

master - dmeventd: reorder mempool allocation
by Zdenek Kabelac 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2b9843c20b3ca268… Commit: 2b9843c20b3ca26867228d89154b611c4464eff2 Parent: 872ea3b98710c2a45c76dc22a606a40b13440d13 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Sep 3 17:39:03 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Sep 3 23:34:36 2015 +0200 dmeventd: reorder mempool allocation Since lvm2_init() effectively detects memory leaks allocate mempool after this initialization (so it's not reported as leak). --- daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c index 9b08bbe..7350623 100644 --- a/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c +++ b/daemons/dmeventd/plugins/lvm2/dmeventd_lvm.c @@ -94,21 +94,22 @@ int dmeventd_lvm2_init(void) pthread_mutex_lock(&_register_mutex); - /* - * Need some space for allocations. 1024 should be more - * than enough for what we need (device mapper name splitting) - */ - if (!_mem_pool && !(_mem_pool = dm_pool_create("mirror_dso", 1024))) - goto out; - if (!_lvm_handle) { if (!getenv("LVM_LOG_FILE_EPOCH")) lvm2_log_fn(_temporary_log_fn); - if (!(_lvm_handle = lvm2_init())) { - dm_pool_destroy(_mem_pool); - _mem_pool = NULL; + if (!(_lvm_handle = lvm2_init())) + goto out; + + /* + * Need some space for allocations. 1024 should be more + * than enough for what we need (device mapper name splitting) + */ + if (!_mem_pool && !(_mem_pool = dm_pool_create("mirror_dso", 1024))) { + lvm2_exit(_lvm_handle); + _lvm_handle = NULL; goto out; } + lvm2_disable_dmeventd_monitoring(_lvm_handle); /* FIXME Temporary: move to dmeventd core */ lvm2_run(_lvm_handle, "_memlock_inc");

1 0

master - thin: do not flush when quering for thin percent
by Zdenek Kabelac 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=872ea3b98710c2a4… Commit: 872ea3b98710c2a45c76dc22a606a40b13440d13 Parent: df110bccbed2bc7f53355fcb16309eb2727ba483 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Sep 3 22:57:50 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Sep 3 23:34:36 2015 +0200 thin: do not flush when quering for thin percent Since we may easily get blocked when checking for percentage of thin-pool - do not flush and just show current values. This avoids holding VG locked when pool is overfilled. --- WHATS_NEW | 1 + lib/activate/dev_manager.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index cb9e1f1..6336f45 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.130 - =================================== + Read thin-pool data and metadata percent without flush. Detect blocked thin-pool and avoid scanning their thin volumes. Check if dm device is usable before checking its size (2.02.116). Extend parsing of cache_check version in configure. diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 6a26d37..d4a349b 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1045,6 +1045,11 @@ static int _percent_run(struct dev_manager *dm, const char *name, wait ? DM_DEVICE_WAITEVENT : DM_DEVICE_STATUS, 0, 0, 0))) return_0; + /* No freeze on overfilled thin-pool, read existing slightly outdated data */ + if (lv && lv_is_thin_pool(lv) && + !dm_task_no_flush(dmt)) + log_warn("Can't set no_flush flag."); /* Non fatal */ + if (!dm_task_run(dmt)) goto_out;

1 0

master - thin: validate mapped size of thin volume
by Zdenek Kabelac 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=df110bccbed2bc7f… Commit: df110bccbed2bc7f53355fcb16309eb2727ba483 Parent: a01eb9c451b136ccb12f3baf6b487604a4f209dc Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Sep 3 22:52:21 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Sep 3 23:34:36 2015 +0200 thin: validate mapped size of thin volume Never show we map more then 100% for a volume. But show warning when there could be some consistency problems. --- lib/thin/thin.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/lib/thin/thin.c b/lib/thin/thin.c index c5f04f3..7bf7f4e 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -620,6 +620,15 @@ static int _thin_target_percent(void **target_state __attribute__((unused)), /* Pool allocates whole chunk so round-up to nearest one */ csize = first_seg(seg->pool_lv)->chunk_size; csize = ((seg->lv->size + csize - 1) / csize) * csize; + if (s->mapped_sectors > csize) { + log_warn("WARNING: LV %s maps %s while the size is only %s.", + display_lvname(seg->lv), + display_size(cmd, s->mapped_sectors), + display_size(cmd, csize)); + /* Don't show nonsense numbers like i.e. 1000% full */ + s->mapped_sectors = csize; + } + *percent = dm_make_percent(s->mapped_sectors, csize); *total_denominator += csize; } else {

1 0

master - thin: detect unusable thins
by Zdenek Kabelac 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a01eb9c451b136cc… Commit: a01eb9c451b136ccb12f3baf6b487604a4f209dc Parent: 81a9da8f6190b567bb26f28ff02be0e6b10cad9a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Sep 2 16:13:31 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Sep 3 23:34:36 2015 +0200 thin: detect unusable thins Try to detect thin-pool which my block lvm2 command from furher processing (i.e. lvextend). Check if pool is read-only or out-of-space and in this case thins will skipped from being scanned (so user may miss some PVs located on thin volumes). --- WHATS_NEW | 1 + lib/activate/dev_manager.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a7c7267..cb9e1f1 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.130 - =================================== + Detect blocked thin-pool and avoid scanning their thin volumes. Check if dm device is usable before checking its size (2.02.116). Extend parsing of cache_check version in configure. Make lvpoll error messages visible in lvmpolld's stderr and in syslog. diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 101cd36..6a26d37 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -518,6 +518,73 @@ out: return r; } +static int _ignore_unusable_thins(struct device *dev) +{ + /* TODO make function for thin testing */ + struct dm_pool *mem; + struct dm_status_thin_pool *status; + struct dm_task *dmt = NULL; + void *next = NULL; + uint64_t start, length; + char *target_type = NULL; + char *params; + int minor, major; + int r = 0; + + if (!(mem = dm_pool_create("unusable_thins", 128))) + return_0; + + if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) + goto_out; + if (!dm_task_no_open_count(dmt)) + goto_out; + if (!dm_task_set_major_minor(dmt, MAJOR(dev->dev), MINOR(dev->dev), 1)) + goto_out; + if (!dm_task_run(dmt)) { + log_error("Failed to get state of mapped device."); + goto out; + } + dm_get_next_target(dmt, next, &start, &length, &target_type, &params); + if (sscanf(params, "%d:%d", &minor, &major) != 2) { + log_error("Failed to get thin-pool major:minor for thin device %d:%d.", + (int)MAJOR(dev->dev), (int)MINOR(dev->dev)); + goto out; + } + dm_task_destroy(dmt); + + if (!(dmt = dm_task_create(DM_DEVICE_STATUS))) + goto_out; + if (!dm_task_no_flush(dmt)) + log_warn("Can't set no_flush."); + if (!dm_task_no_open_count(dmt)) + goto_out; + if (!dm_task_set_major_minor(dmt, minor, major, 1)) + goto_out; + if (!dm_task_run(dmt)) { + log_error("Failed to get state of mapped device."); + goto out; + } + + dm_get_next_target(dmt, next, &start, &length, &target_type, &params); + if (!dm_get_status_thin_pool(mem, params, &status)) + return_0; + + if (status->read_only || status->out_of_data_space) { + log_warn("WARNING: %s: Thin's thin-pool needs inspection.", + dev_name(dev)); + goto out; + } + + r = 1; +out: + if (dmt) + dm_task_destroy(dmt); + + dm_pool_destroy(mem); + + return r; +} + /* * device_is_usable * @dev @@ -646,6 +713,13 @@ int device_is_usable(struct device *dev, struct dev_usable_check_params check) goto out; } + /* TODO: extend check struct ? */ + if (target_type && !strcmp(target_type, "thin") && + !_ignore_unusable_thins(dev)) { + log_debug_activation("%s: %s device %s not usable.", dev_name(dev), target_type, name); + goto out; + } + if (target_type && strcmp(target_type, "error")) only_error_target = 0; } while (next);

1 0

master - filters: swap device_is_usable test
by Zdenek Kabelac 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=81a9da8f6190b567… Commit: 81a9da8f6190b567bb26f28ff02be0e6b10cad9a Parent: a3c7e326c3e9950fe74e433c406d6e1b5a53bf25 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Sep 2 16:08:30 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Sep 3 23:34:36 2015 +0200 filters: swap device_is_usable test Fix regression introduced with commit: 2fc126b00d83991c6a2f3ed9aa61457294a4c45e This commit has moved pv_min_size() test in front of device_is_usable(). However pv_min_size needs to open device, so it may have actually get blocked. So restore the original order and first validate dm device to be usable for open. It's worth to note that such check is not 'race-free', but it usually eliminates 99.99% of problems ;). --- WHATS_NEW | 2 ++ lib/filters/filter-usable.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 48b2a07..a7c7267 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,7 @@ Version 2.02.130 - =================================== + Check if dm device is usable before checking its size (2.02.116). + Extend parsing of cache_check version in configure. Make lvpoll error messages visible in lvmpolld's stderr and in syslog. Add 'make install_full_man' to install all man pages regardless of config. diff --git a/lib/filters/filter-usable.c b/lib/filters/filter-usable.c index e39cb54..9377661 100644 --- a/lib/filters/filter-usable.c +++ b/lib/filters/filter-usable.c @@ -112,26 +112,11 @@ static int _passes_usable_filter(struct dev_filter *f, struct device *dev) { filter_mode_t mode = *((filter_mode_t *) f->private); struct dev_usable_check_params ucp = {0}; - int r; - - /* check if the device is not too small to hold a PV */ - switch (mode) { - case FILTER_MODE_NO_LVMETAD: - /* fall through */ - case FILTER_MODE_PRE_LVMETAD: - if (!_check_pv_min_size(dev)) - return 0; - break; - case FILTER_MODE_POST_LVMETAD: - /* nothing to do here */ - break; - } + int r = 1; /* further checks are done on dm devices only */ - if (!dm_is_dm_major(MAJOR(dev->dev))) - return 1; - - switch (mode) { + if (dm_is_dm_major(MAJOR(dev->dev))) { + switch (mode) { case FILTER_MODE_NO_LVMETAD: ucp.check_empty = 1; ucp.check_blocked = 1; @@ -160,10 +145,25 @@ static int _passes_usable_filter(struct dev_filter *f, struct device *dev) ucp.check_error_target = 0; ucp.check_reserved = 0; break; + } + + if (!(r = device_is_usable(dev, ucp))) + log_debug_devs("%s: Skipping unusable device.", dev_name(dev)); } - if (!(r = device_is_usable(dev, ucp))) - log_debug_devs("%s: Skipping unusable device", dev_name(dev)); + if (r) { + /* check if the device is not too small to hold a PV */ + switch (mode) { + case FILTER_MODE_NO_LVMETAD: + /* fall through */ + case FILTER_MODE_PRE_LVMETAD: + r = _check_pv_min_size(dev); + break; + case FILTER_MODE_POST_LVMETAD: + /* nothing to do here */ + break; + } + } return r; }

1 0

master - libdm: relocate parsing of thin-pool status
by Zdenek Kabelac 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a3c7e326c3e9950f… Commit: a3c7e326c3e9950fe74e433c406d6e1b5a53bf25 Parent: 5ce334923f1f82e0ca5dcbd0f5e830109c1f9c0b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Sep 2 11:10:59 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Sep 3 23:34:36 2015 +0200 libdm: relocate parsing of thin-pool status Use single routine for parsing status. Internally we do not need to allocate pool memory for passed struct. --- WHATS_NEW_DM | 1 + libdm/libdm-deptree.c | 111 +++++++++++++++++++++++++----------------------- 2 files changed, 59 insertions(+), 53 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 8d74222..c40a023 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.107 - =================================== + Parse thin-pool status with one single routine internally. Fix devmapper.pc pkgconfig file to not reference non-existent rt.pc file. Reinstate dm_task_get_info@Base to libdevmapper exports. (1.02.106) diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 84f1d28..d40362d 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1427,7 +1427,50 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor, return r; } -static int _thin_pool_status_transaction_id(struct dm_tree_node *dnode, uint64_t *transaction_id) +static int _thin_pool_parse_status(const char *params, + struct dm_status_thin_pool *s) +{ + int pos; + + if (!params) { + log_error("Failed to parse invalid thin params."); + return 0; + } + + /* FIXME: add support for held metadata root */ + if (sscanf(params, FMTu64 " " FMTu64 "/" FMTu64 " " FMTu64 "/" FMTu64 "%n", + &s->transaction_id, + &s->used_metadata_blocks, + &s->total_metadata_blocks, + &s->used_data_blocks, + &s->total_data_blocks, &pos) < 5) { + log_error("Failed to parse thin pool params: %s.", params); + return 0; + } + + /* New status flags */ + if (strstr(params + pos, "no_discard_passdown")) + s->discards = DM_THIN_DISCARDS_NO_PASSDOWN; + else if (strstr(params + pos, "ignore_discard")) + s->discards = DM_THIN_DISCARDS_IGNORE; + else /* default discard_passdown */ + s->discards = DM_THIN_DISCARDS_PASSDOWN; + + if (strstr(params + pos, "ro ")) + s->read_only = 1; + else if (strstr(params + pos, "fail")) + s->fail = 1; + else if (strstr(params + pos, "out_of_data_space")) + s->out_of_data_space = 1; + + if (strstr(params + pos, "error_if_no_space")) + s->error_if_no_space = 1; + + return 1; +} + +static int _thin_pool_get_status(struct dm_tree_node *dnode, + struct dm_status_thin_pool *s) { struct dm_task *dmt; int r = 0; @@ -1458,14 +1501,12 @@ static int _thin_pool_status_transaction_id(struct dm_tree_node *dnode, uint64_t goto out; } - if (!params || (sscanf(params, FMTu64, transaction_id) != 1)) { - log_error("Failed to parse transaction_id from %s.", params); - goto out; - } + if (!_thin_pool_parse_status(params, s)) + goto_out; log_debug_activation("Found transaction id %" PRIu64 " for thin pool %s " "with status line: %s.", - *transaction_id, _node_name(dnode), params); + s->transaction_id, _node_name(dnode), params); r = 1; out: @@ -1553,7 +1594,7 @@ static int _node_send_messages(struct dm_tree_node *dnode, { struct load_segment *seg; struct thin_message *tmsg; - uint64_t trans_id; + struct dm_status_thin_pool stp = { 0 }; const char *uuid; int have_messages; @@ -1572,23 +1613,23 @@ static int _node_send_messages(struct dm_tree_node *dnode, return 1; } - if (!_thin_pool_status_transaction_id(dnode, &trans_id)) + if (!_thin_pool_get_status(dnode, &stp)) return_0; have_messages = !dm_list_empty(&seg->thin_messages) ? 1 : 0; - if (trans_id == seg->transaction_id) { + if (stp.transaction_id == seg->transaction_id) { dnode->props.send_messages = 0; /* messages already committed */ if (have_messages) log_debug_activation("Thin pool %s transaction_id matches %" PRIu64 ", skipping messages.", - _node_name(dnode), trans_id); + _node_name(dnode), stp.transaction_id); return 1; } /* Error if there are no stacked messages or id mismatches */ - if ((trans_id + 1) != seg->transaction_id) { + if ((stp.transaction_id + 1) != seg->transaction_id) { log_error("Thin pool %s transaction_id is %" PRIu64 ", while expected %" PRIu64 ".", - _node_name(dnode), trans_id, seg->transaction_id - have_messages); + _node_name(dnode), stp.transaction_id, seg->transaction_id - have_messages); return 0; } @@ -1599,12 +1640,12 @@ static int _node_send_messages(struct dm_tree_node *dnode, if (!(_thin_pool_node_message(dnode, tmsg))) return_0; if (tmsg->message.type == DM_THIN_MESSAGE_SET_TRANSACTION_ID) { - if (!_thin_pool_status_transaction_id(dnode, &trans_id)) + if (!_thin_pool_get_status(dnode, &stp)) return_0; - if (trans_id != tmsg->message.u.m_set_transaction_id.new_id) { + if (stp.transaction_id != tmsg->message.u.m_set_transaction_id.new_id) { log_error("Thin pool %s transaction_id is %" PRIu64 " and does not match expected %" PRIu64 ".", - _node_name(dnode), trans_id, + _node_name(dnode), stp.transaction_id, tmsg->message.u.m_set_transaction_id.new_id); return 0; } @@ -4003,48 +4044,17 @@ int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, struct dm_status_thin_pool **status) { struct dm_status_thin_pool *s; - int pos; - - if (!params) { - log_error("Failed to parse invalid thin pool params."); - return 0; - } if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_thin_pool)))) { log_error("Failed to allocate thin_pool status structure."); return 0; } - /* FIXME: add support for held metadata root */ - if (sscanf(params, FMTu64 " " FMTu64 "/" FMTu64 " " FMTu64 "/" FMTu64 "%n", - &s->transaction_id, - &s->used_metadata_blocks, - &s->total_metadata_blocks, - &s->used_data_blocks, - &s->total_data_blocks, &pos) < 5) { + if (!_thin_pool_parse_status(params, s)) { dm_pool_free(mem, s); - log_error("Failed to parse thin pool params: %s.", params); - return 0; + return_0; } - /* New status flags */ - if (strstr(params + pos, "no_discard_passdown")) - s->discards = DM_THIN_DISCARDS_NO_PASSDOWN; - else if (strstr(params + pos, "ignore_discard")) - s->discards = DM_THIN_DISCARDS_IGNORE; - else /* default discard_passdown */ - s->discards = DM_THIN_DISCARDS_PASSDOWN; - - if (strstr(params + pos, "ro ")) - s->read_only = 1; - else if (strstr(params + pos, "fail")) - s->fail = 1; - else if (strstr(params + pos, "out_of_data_space")) - s->out_of_data_space = 1; - - if (strstr(params + pos, "error_if_no_space")) - s->error_if_no_space = 1; - *status = s; return 1; @@ -4055,11 +4065,6 @@ int dm_get_status_thin(struct dm_pool *mem, const char *params, { struct dm_status_thin *s; - if (!params) { - log_error("Failed to parse invalid thin params."); - return 0; - } - if (!(s = dm_pool_zalloc(mem, sizeof(struct dm_status_thin)))) { log_error("Failed to allocate thin status structure."); return 0;

1 0

master - configure: better parsing of cache_check version
by Zdenek Kabelac 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5ce334923f1f82e0… Commit: 5ce334923f1f82e0ca5dcbd0f5e830109c1f9c0b Parent: 49b5022993cd57f7fda416bd62d182cdbe209fb8 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Sep 3 22:48:56 2015 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Sep 3 23:34:36 2015 +0200 configure: better parsing of cache_check version Properly read also version string like 0.5.5-1.fc24 and read just first 3 digits split by '.' Also remove one extra $HAVE_REALTIME. --- configure | 4 +--- configure.in | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure b/configure index f4820c4..c7b7dd5 100755 --- a/configure +++ b/configure @@ -8816,7 +8816,7 @@ $as_echo "$as_me: WARNING: cache_check not found in path $PATH" >&2;} if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then $CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp read -r CACHE_CHECK_VSN < conftest.tmp - IFS=. read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH < conftest.tmp + IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp rm -f conftest.tmp # Require version >= 0.5.4 for --clear-needs-check-flag @@ -12852,8 +12852,6 @@ $as_echo "#define HAVE_REALTIME 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling realtime clock" >&5 $as_echo "$as_me: WARNING: Disabling realtime clock" >&2;} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_REALTIME" >&5 -$as_echo "$HAVE_REALTIME" >&6; } fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat has st_ctim." >&5 diff --git a/configure.in b/configure.in index 3d83af5..868b373 100644 --- a/configure.in +++ b/configure.in @@ -586,7 +586,7 @@ case "$CACHE" in if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then $CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp read -r CACHE_CHECK_VSN < conftest.tmp - IFS=. read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH < conftest.tmp + IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp rm -f conftest.tmp # Require version >= 0.5.4 for --clear-needs-check-flag @@ -1585,7 +1585,6 @@ if test "$REALTIME" = yes; then else AC_MSG_WARN(Disabling realtime clock) fi - AC_MSG_RESULT($HAVE_REALTIME) fi dnl Check if the system has struct stat st_ctim.

1 0

master - dmstats: support --noheadings for histogram fields
by Bryn Reeves 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=49b5022993cd57f7… Commit: 49b5022993cd57f7fda416bd62d182cdbe209fb8 Parent: 84d88cb2cf11ecb3c186477cd3c79cef0fa1c378 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Sep 3 21:56:34 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Sep 3 22:04:11 2015 +0100 dmstats: support --noheadings for histogram fields --- tools/dmsetup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index ea30a3c..432677b 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -3443,7 +3443,7 @@ static const char *_get_histogram_string(const struct dm_stats *dms, int rel, int vals, int bounds) { const struct dm_histogram *dmh; - int flags = 0; + int flags = 0, width = (_switches[NOHEADINGS_ARG]) ? -1 : 0; if (!(dmh = dm_stats_get_histogram(dms, DM_STATS_REGION_CURRENT, DM_STATS_AREA_CURRENT))) @@ -3460,7 +3460,7 @@ static const char *_get_histogram_string(const struct dm_stats *dms, int rel, flags |= (_switches[NOTIMESUFFIX_ARG]) ? 0 : DM_HISTOGRAM_SUFFIX; /* FIXME: make unit conversion optional. */ - return dm_histogram_to_string(dmh, -1, 0, flags); + return dm_histogram_to_string(dmh, -1, width, flags); } static int _stats_hist_count_disp(struct dm_report *rh,

1 0

master - dmstats: add --notimesuffix switch
by Bryn Reeves 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=84d88cb2cf11ecb3… Commit: 84d88cb2cf11ecb3c186477cd3c79cef0fa1c378 Parent: f09e4f7b10db5051b40fe50b5d6a99a171ce04ca Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Sep 3 21:55:25 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Sep 3 22:04:10 2015 +0100 dmstats: add --notimesuffix switch Add a switch to disable the printing of time unit suffixes in histogram bounds descriptions. --- man/dmstats.8.in | 8 +++++++- tools/dmsetup.c | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/man/dmstats.8.in b/man/dmstats.8.in index daa489d..1e19524 100644 --- a/man/dmstats.8.in +++ b/man/dmstats.8.in @@ -79,6 +79,7 @@ dmstats \(em device-mapper statistics management .RB [ \-\-units .IR units ] .RB [ \-\-nosuffix ] +.RB [ \-\-notimesuffix ] .br .B dmstats list .RI [ device_name ] @@ -88,7 +89,7 @@ dmstats \(em device-mapper statistics management .RB [ \-\-units .IR units ] .RB [ \-\-nosuffix ] -.RB [ \-\-nosuffix ] +.RB [ \-\-notimesuffix ] .RB [ \-v | \-\-verbose \ [ \-v | \-\-verbose ] .br .B dmstats print @@ -121,6 +122,7 @@ dmstats \(em device-mapper statistics management .RB [ \-\-units .IR units ] .RB [ \-\-nosuffix ] +.RB [ \-\-notimesuffix ] .br .ad b .SH DESCRIPTION @@ -206,6 +208,10 @@ Specify the minor number. Suppress the suffix on output sizes. Use with \fB\-\-units\fP (except h and H) if processing the output. .TP +.B \-\-notimesuffix +Suppress the suffix on output time values. Histogram boundary values +will be reported in units of nanoseconds. +.TP .BR \-o | \-\-options Specify which report fields to display. .TP diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 9c9711d..ea30a3c 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -187,6 +187,7 @@ enum { NOOPENCOUNT_ARG, NOSUFFIX_ARG, NOTABLE_ARG, + NOTIMESUFFIX_ARG, UDEVCOOKIE_ARG, NOUDEVRULES_ARG, NOUDEVSYNC_ARG, @@ -3456,7 +3457,7 @@ static const char *_get_histogram_string(const struct dm_stats *dms, int rel, flags |= (rel) ? DM_HISTOGRAM_PERCENT : 0; - flags |= DM_HISTOGRAM_SUFFIX; + flags |= (_switches[NOTIMESUFFIX_ARG]) ? 0 : DM_HISTOGRAM_SUFFIX; /* FIXME: make unit conversion optional. */ return dm_histogram_to_string(dmh, -1, 0, flags); @@ -5704,6 +5705,7 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) {"noopencount", 0, &ind, NOOPENCOUNT_ARG}, {"nosuffix", 0, &ind, NOSUFFIX_ARG}, {"notable", 0, &ind, NOTABLE_ARG}, + {"notimesuffix", 0, &ind, NOTIMESUFFIX_ARG}, {"udevcookie", 1, &ind, UDEVCOOKIE_ARG}, {"noudevrules", 0, &ind, NOUDEVRULES_ARG}, {"noudevsync", 0, &ind, NOUDEVSYNC_ARG}, @@ -5857,6 +5859,8 @@ static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) _switches[NOSUFFIX_ARG]++; if (c == 'n' || ind == NOTABLE_ARG) _switches[NOTABLE_ARG]++; + if (ind == NOTIMESUFFIX_ARG) + _switches[NOTIMESUFFIX_ARG]++; if (c == 'o' || ind == OPTIONS_ARG) { _switches[OPTIONS_ARG]++; _string_args[OPTIONS_ARG] = optarg;

1 0

master - libdm: allow formatting histogram strings with no whitespace
by Bryn Reeves 03 Sep '15

03 Sep '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f09e4f7b10db5051… Commit: f09e4f7b10db5051b40fe50b5d6a99a171ce04ca Parent: 0a73a5012aece3d0f7fd03a270cfe5067c1fafc8 Author: Bryn M. Reeves <bmr(a)redhat.com> AuthorDate: Thu Sep 3 21:48:15 2015 +0100 Committer: Bryn M. Reeves <bmr(a)redhat.com> CommitterDate: Thu Sep 3 22:04:10 2015 +0100 libdm: allow formatting histogram strings with no whitespace Allow dm_histogram_to_string() to format histogram strings with no whitespace by passing a width value less than zero. --- libdm/libdevmapper.h | 10 ++++++++-- libdm/libdm-stats.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index c81a9e5..098fa85 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -2826,8 +2826,8 @@ uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh); /* * Histogram formatting flags. */ -#define DM_HISTOGRAM_VALUES 0x1 -#define DM_HISTOGRAM_SUFFIX 0x2 +#define DM_HISTOGRAM_SUFFIX 0x1 +#define DM_HISTOGRAM_VALUES 0x2 #define DM_HISTOGRAM_PERCENT 0X4 #define DM_HISTOGRAM_BOUNDS_LOWER 0x10 #define DM_HISTOGRAM_BOUNDS_UPPER 0x20 @@ -2840,6 +2840,12 @@ uint64_t dm_histogram_get_sum(const struct dm_histogram *dmh); * The bin argument selects the bin to format. If this argument is less * than zero all bins will be included in the resulting string. * + * width specifies a minimum width for the field in characters; if it is + * zero the width will be determined automatically based on the options + * selected for formatting. A value less than zero disables field width + * control: bin boundaries and values will be output with a minimum + * amount of whitespace. + * * flags is a collection of flag arguments that control the string format: * * DM_HISTOGRAM_VALUES - Include bin values in the string. diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c index d611635..90f2e1d 100644 --- a/libdm/libdm-stats.c +++ b/libdm/libdm-stats.c @@ -2116,7 +2116,7 @@ static int _make_bounds_string(char *buf, size_t size, uint64_t lower, { const char *l_suff = NULL; const char *u_suff = NULL; - const char *sep = (flags & DM_HISTOGRAM_VALUES) ? ": " : ""; + const char *sep = ""; char bound_buf[32]; int bounds = flags & DM_HISTOGRAM_BOUNDS_MASK; @@ -2131,6 +2131,9 @@ static int _make_bounds_string(char *buf, size_t size, uint64_t lower, } else l_suff = u_suff = ""; + if (flags & DM_HISTOGRAM_VALUES) + sep = ":"; + if (bounds > DM_HISTOGRAM_BOUNDS_LOWER) { /* Handle infinite uppermost bound. */ if (upper == UINT64_MAX) { @@ -2162,9 +2165,11 @@ out: return 0; } +#define BOUND_WIDTH_NOSUFFIX 10 /* 999999999 nsecs */ #define BOUND_WIDTH 6 /* bounds string up to 9999xs */ #define COUNT_WIDTH 6 /* count string: up to 9999 */ -#define PERCENT_WIDTH 8 /* percent string : 0.00-100.00% */ +#define PERCENT_WIDTH 6 /* percent string : 0.00-100.00% */ +#define DM_HISTOGRAM_VALUES_MASK 0x06 const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, int width, int flags) @@ -2186,12 +2191,15 @@ const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, } else start = last = bin; - if (flags & DM_HISTOGRAM_PERCENT) + if (width < 0 || !values) + width = minwidth = 0; /* no padding */ + else if (flags & DM_HISTOGRAM_PERCENT) width = minwidth = (width) ? : PERCENT_WIDTH; else if (flags & DM_HISTOGRAM_VALUES) width = minwidth = (width) ? : COUNT_WIDTH; - else - width = 0; /* bounds only */ + + if (values && !width) + sep = ":"; /* Set bounds string to the empty string. */ bounds_buf[0] = '\0'; @@ -2200,18 +2208,38 @@ const char *dm_histogram_to_string(const struct dm_histogram *dmh, int bin, for (bin = start; bin <= last; bin++) { if (bounds) { + int bounds_width; + + /* Default bounds width depends on time suffixes. */ + bounds_width = (!(flags & DM_HISTOGRAM_SUFFIX)) + ? BOUND_WIDTH_NOSUFFIX + : BOUND_WIDTH ; + + bounds_width = (!width) ? width : bounds_width; + lower = dm_histogram_get_bin_lower(dmh, bin); upper = dm_histogram_get_bin_upper(dmh, bin); - _make_bounds_string(bounds_buf, sizeof(bounds_buf), - lower, upper, flags, - (width) ? BOUND_WIDTH : 0); - sep = ", "; /* Comma separates "bounds: value" pairs */ - width -= (int) (strlen(bounds_buf) - BOUND_WIDTH); + + len = sizeof(bounds_buf); + len = _make_bounds_string(bounds_buf, len, + lower, upper, flags, + bounds_width); + /* + * Comma separates "bounds: value" pairs unless + * --noheadings is used. + */ + sep = (width || !values) ? "," : ":"; + + /* Adjust width by real bounds length if set. */ + width -= (width) ? (len - (bounds_width + 1)) : 0; + + /* -ve width indicates specified width was overrun. */ width = (width > 0) ? width : 0; } if (bin == last) sep = ""; + if (flags & DM_HISTOGRAM_PERCENT) { dm_percent_t pr; float value;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits September 2015