diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-09-09 14:59:38 +0200 |
---|---|---|
committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-09-09 15:24:15 +0200 |
commit | e6f735d411e5911de186a610932c9bb9638275eb (patch) | |
tree | fc42e6e75181bb49e735c4cd70e5d4a696a923c1 /lib/metadata | |
parent | 89595a366554191c3df1a18e1f82b79c450a21ad (diff) | |
download | lvm2-e6f735d411e5911de186a610932c9bb9638275eb.tar.gz |
vdo: read new sysfs path
New versions of kvdo module exposes statistics at new location:
/sys/block/dm-XXX/vdo/statistics/...
Enhance lvm2 to access this location first.
Also if the statistic info is missing - make it 'debug' level info,
so it is not failing 'lvs' command.
Diffstat (limited to 'lib/metadata')
-rw-r--r-- | lib/metadata/metadata-exported.h | 3 | ||||
-rw-r--r-- | lib/metadata/vdo_manip.c | 46 |
2 files changed, 27 insertions, 22 deletions
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 96a9533d2..7bac5b900 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -1365,7 +1365,8 @@ const char *get_vdo_write_policy_name(enum dm_vdo_write_policy policy); uint64_t get_vdo_pool_virtual_size(const struct lv_segment *vdo_pool_seg); int update_vdo_pool_virtual_size(struct lv_segment *vdo_pool_seg); int parse_vdo_pool_status(struct dm_pool *mem, const struct logical_volume *vdo_pool_lv, - const char *params, struct lv_status_vdo *status); + const char *params, const struct dm_info *dminfo, + struct lv_status_vdo *status); struct logical_volume *convert_vdo_pool_lv(struct logical_volume *data_lv, const struct dm_vdo_target_params *vtp, uint32_t *virtual_extents, diff --git a/lib/metadata/vdo_manip.c b/lib/metadata/vdo_manip.c index 673db98e2..fa9c893cb 100644 --- a/lib/metadata/vdo_manip.c +++ b/lib/metadata/vdo_manip.c @@ -125,48 +125,56 @@ int update_vdo_pool_virtual_size(struct lv_segment *vdo_pool_seg) return 1; } -static int _sysfs_get_kvdo_value(const char *dm_name, const char *vdo_param, uint64_t *value) +static int _sysfs_get_kvdo_value(const char *dm_name, const struct dm_info *dminfo, + const char *vdo_param, uint64_t *value) { char path[PATH_MAX]; char temp[64]; int fd, size, r = 0; - if (dm_snprintf(path, sizeof(path), "%skvdo/%s/%s", - dm_sysfs_dir(), dm_name, vdo_param) < 0) { - log_error("Failed to build kmod path."); + if (dm_snprintf(path, sizeof(path), "%s/block/dm-%d/vdo/%s", + dm_sysfs_dir(), dminfo->minor, vdo_param) < 0) { + log_debug("Failed to build kvdo path."); return 0; } if ((fd = open(path, O_RDONLY)) < 0) { - if (errno != ENOENT) - log_sys_error("open", path); - else + /* try with older location */ + if (dm_snprintf(path, sizeof(path), "%skvdo/%s/%s", + dm_sysfs_dir(), dm_name, vdo_param) < 0) { + log_debug("Failed to build kvdo path."); + return 0; + } + + if ((fd = open(path, O_RDONLY)) < 0) { log_sys_debug("open", path); - goto bad; + goto bad; + } } if ((size = read(fd, temp, sizeof(temp) - 1)) < 0) { - log_sys_error("read", path); + log_sys_debug("read", path); goto bad; } temp[size] = 0; errno = 0; *value = strtoll(temp, NULL, 0); if (errno) { - log_sys_error("strtool", path); + log_sys_debug("strtool", path); goto bad; } r = 1; bad: if (fd >= 0 && close(fd)) - log_sys_error("close", path); + log_sys_debug("close", path); return r; } int parse_vdo_pool_status(struct dm_pool *mem, const struct logical_volume *vdo_pool_lv, - const char *params, struct lv_status_vdo *status) + const char *params, const struct dm_info *dminfo, + struct lv_status_vdo *status) { struct dm_vdo_status_parse_result result; char *dm_name; @@ -190,15 +198,11 @@ int parse_vdo_pool_status(struct dm_pool *mem, const struct logical_volume *vdo_ status->vdo = result.status; - if (result.status->operating_mode == DM_VDO_MODE_NORMAL) { - if (!_sysfs_get_kvdo_value(dm_name, "statistics/data_blocks_used", - &status->data_blocks_used)) - return_0; - - if (!_sysfs_get_kvdo_value(dm_name, "statistics/logical_blocks_used", - &status->logical_blocks_used)) - return_0; - + if ((result.status->operating_mode == DM_VDO_MODE_NORMAL) && + _sysfs_get_kvdo_value(dm_name, dminfo, "statistics/data_blocks_used", + &status->data_blocks_used) && + _sysfs_get_kvdo_value(dm_name, dminfo, "statistics/logical_blocks_used", + &status->logical_blocks_used)) { status->usage = dm_make_percent(result.status->used_blocks, result.status->total_blocks); status->saving = dm_make_percent(status->logical_blocks_used - status->data_blocks_used, |