shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

cache[pool]: Populate existing report fields with cache data

Browse Source 
For the report fields that already exist that are relevent to cache
and cache pool LVs (like 'origin', 'metadata_lv', etc), populate
them.
This commit is contained in:
Jonathan Brassow 2014-02-05 09:44:37 -06:00
parent 96626f64fa
commit 36f9fadcb4
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/metadata/lv.c
View File

@ -170,7 +170,7 @@ uint64_t lvseg_chunksize(const struct lv_segment *seg)
if (lv_is_cow(seg->lv)) if (lv_is_cow(seg->lv))
size = (uint64_t) find_snapshot(seg->lv)->chunk_size; size = (uint64_t) find_snapshot(seg->lv)->chunk_size;
else if (seg_is_thin_pool(seg)) else if (seg_is_thin_pool(seg) || seg_is_cache_pool(seg))
size = (uint64_t) seg->chunk_size; size = (uint64_t) seg->chunk_size;
else else
size = UINT64_C(0); size = UINT64_C(0);
@ -202,6 +202,9 @@ char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv)
if (lv_is_cow(lv)) if (lv_is_cow(lv))
return lv_name_dup(mem, origin_from_cow(lv)); return lv_name_dup(mem, origin_from_cow(lv));
if (lv_is_cache(lv) && first_seg(lv)->origin)
return lv_name_dup(mem, first_seg(lv)->origin);
if (lv_is_thin_volume(lv) && first_seg(lv)->origin) if (lv_is_thin_volume(lv) && first_seg(lv)->origin)
return lv_name_dup(mem, first_seg(lv)->origin); return lv_name_dup(mem, first_seg(lv)->origin);
@ -246,7 +249,8 @@ char *lv_pool_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
struct lv_segment *seg; struct lv_segment *seg;
dm_list_iterate_items(seg, &lv->segments) dm_list_iterate_items(seg, &lv->segments)
if (seg_is_thin_volume(seg) && seg->pool_lv) if (seg->pool_lv &&
(seg_is_thin_volume(seg) || seg_is_cache(seg)))
return dm_pool_strdup(mem, seg->pool_lv->name); return dm_pool_strdup(mem, seg->pool_lv->name);
return NULL; return NULL;
@ -254,14 +258,16 @@ char *lv_pool_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
char *lv_data_lv_dup(struct dm_pool *mem, const struct logical_volume *lv) char *lv_data_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
{ {
struct lv_segment *seg = lv_is_thin_pool(lv) ? first_seg(lv) : NULL; struct lv_segment *seg = (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) ?
first_seg(lv) : NULL;
return seg ? dm_pool_strdup(mem, seg_lv(seg, 0)->name) : NULL; return seg ? dm_pool_strdup(mem, seg_lv(seg, 0)->name) : NULL;
} }
char *lv_metadata_lv_dup(struct dm_pool *mem, const struct logical_volume *lv) char *lv_metadata_lv_dup(struct dm_pool *mem, const struct logical_volume *lv)
{ {
struct lv_segment *seg = lv_is_thin_pool(lv) ? first_seg(lv) : NULL; struct lv_segment *seg = (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) ?
first_seg(lv) : NULL;
return seg ? dm_pool_strdup(mem, seg->metadata_lv->name) : NULL; return seg ? dm_pool_strdup(mem, seg->metadata_lv->name) : NULL;
} }
@ -338,7 +344,8 @@ uint64_t lv_origin_size(const struct logical_volume *lv)
uint64_t lv_metadata_size(const struct logical_volume *lv) uint64_t lv_metadata_size(const struct logical_volume *lv)
{ {
struct lv_segment *seg = lv_is_thin_pool(lv) ? first_seg(lv) : NULL; struct lv_segment *seg = (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) ?
first_seg(lv) : NULL;
return seg ? seg->metadata_lv->size : 0; return seg ? seg->metadata_lv->size : 0;
} }
@ -546,6 +553,10 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
/* Origin takes precedence over mirror and thin volume */ /* Origin takes precedence over mirror and thin volume */
else if (lv_is_origin(lv) || lv_is_external_origin(lv)) else if (lv_is_origin(lv) || lv_is_external_origin(lv))
repstr[0] = (lv_is_merging_origin(lv)) ? 'O' : 'o'; repstr[0] = (lv_is_merging_origin(lv)) ? 'O' : 'o';
else if (lv_is_cache_pool_metadata(lv))
repstr[0] = 'e';
else if (lv_is_cache_type(lv))
repstr[0] = 'C';
else if (lv_is_thin_pool_metadata(lv) || else if (lv_is_thin_pool_metadata(lv) ||
lv_is_pool_metadata_spare(lv) || lv_is_pool_metadata_spare(lv) ||
(lv->status & RAID_META)) (lv->status & RAID_META))
@ -638,6 +649,8 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
if (lv_is_thin_pool(lv) || lv_is_thin_volume(lv)) if (lv_is_thin_pool(lv) || lv_is_thin_volume(lv))
repstr[6] = 't'; repstr[6] = 't';
else if (lv_is_cache_type(lv))
repstr[6] = 'C';
else if (lv_is_raid_type(lv)) else if (lv_is_raid_type(lv))
repstr[6] = 'r'; repstr[6] = 'r';
else if (lv_is_mirror_type(lv)) else if (lv_is_mirror_type(lv))
@ -741,7 +754,8 @@ static int _lv_is_exclusive(struct logical_volume *lv)
/* Some devices require exlusivness */ /* Some devices require exlusivness */
return seg_is_raid(first_seg(lv)) || return seg_is_raid(first_seg(lv)) ||
lv_is_origin(lv) || lv_is_origin(lv) ||
lv_is_thin_type(lv); lv_is_thin_type(lv) ||
lv_is_cache_type(lv);
} }
int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv,

13
lib/report/report.c
View File

@ -321,7 +321,7 @@ static int _datalv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__(
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
const struct lv_segment *seg = lv_is_thin_pool(lv) ? first_seg(lv) : NULL; const struct lv_segment *seg = (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) ? first_seg(lv) : NULL;
if (seg) if (seg)
return _lvname_disp(rh, mem, field, seg_lv(seg, 0), private); return _lvname_disp(rh, mem, field, seg_lv(seg, 0), private);
@ -334,7 +334,7 @@ static int _metadatalv_disp(struct dm_report *rh, struct dm_pool *mem __attribut
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
const struct lv_segment *seg = lv_is_thin_pool(lv) ? first_seg(lv) : NULL; const struct lv_segment *seg = (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) ? first_seg(lv) : NULL;
if (seg) if (seg)
return _lvname_disp(rh, mem, field, seg->metadata_lv, private); return _lvname_disp(rh, mem, field, seg->metadata_lv, private);
@ -347,7 +347,8 @@ static int _poollv_disp(struct dm_report *rh, struct dm_pool *mem __attribute__(
const void *data, void *private __attribute__((unused))) const void *data, void *private __attribute__((unused)))
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
struct lv_segment *seg = lv_is_thin_volume(lv) ? first_seg(lv) : NULL; struct lv_segment *seg = (lv_is_thin_volume(lv) || lv_is_cache(lv)) ?
first_seg(lv) : NULL;
if (seg) if (seg)
return _lvname_disp(rh, mem, field, seg->pool_lv, private); return _lvname_disp(rh, mem, field, seg->pool_lv, private);
@ -373,10 +374,14 @@ static int _origin_disp(struct dm_report *rh, struct dm_pool *mem,
const void *data, void *private) const void *data, void *private)
{ {
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
const struct lv_segment *seg = first_seg(lv);
if (lv_is_cow(lv)) if (lv_is_cow(lv))
return _lvname_disp(rh, mem, field, origin_from_cow(lv), private); return _lvname_disp(rh, mem, field, origin_from_cow(lv), private);
if (lv_is_cache(lv))
return _lvname_disp(rh, mem, field, seg_lv(seg, 0), private);
if (lv_is_thin_volume(lv) && first_seg(lv)->origin) if (lv_is_thin_volume(lv) && first_seg(lv)->origin)
return _lvname_disp(rh, mem, field, first_seg(lv)->origin, private); return _lvname_disp(rh, mem, field, first_seg(lv)->origin, private);
@ -1051,7 +1056,7 @@ static int _lvmetadatasize_disp(struct dm_report *rh, struct dm_pool *mem,
const struct logical_volume *lv = (const struct logical_volume *) data; const struct logical_volume *lv = (const struct logical_volume *) data;
uint64_t size; uint64_t size;
if (lv_is_thin_pool(lv)) { if (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) {
size = lv_metadata_size(lv); size = lv_metadata_size(lv);
return _size64_disp(rh, mem, field, &size, private); return _size64_disp(rh, mem, field, &size, private);
} }