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

cachevol: rename converted LV to _cvol

Browse Source 
When converting existing public LV to internally used
'CacheVol' LV - rename LV to LV_cvol.

When splitting CacheVol, remove _cvol suffix.
This commit is contained in:
Zdenek Kabelac 2019-10-12 23:37:17 +02:00
parent f6d171ffe3
commit 8a8e6ebba2
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.03.06 - Version 2.03.06 -
================================ ================================
Rename LV converted to cachevol to use _cvol suffix.
Use normal LVs for wiping of cachevols. Use normal LVs for wiping of cachevols.
Reload cleanered cache DM only with cleaner policy. Reload cleanered cache DM only with cleaner policy.
Fix cmd return when zering of cachevol fails. Fix cmd return when zering of cachevol fails.

29
tools/lvconvert.c
View File

@ -1840,6 +1840,8 @@ static int _lvconvert_split_and_keep_cachevol(struct cmd_context *cmd,
struct logical_volume *lv, struct logical_volume *lv,
struct logical_volume *lv_fast) struct logical_volume *lv_fast)
{ {
char cvol_name[NAME_LEN];
char *c;
struct lv_segment *cache_seg = first_seg(lv); struct lv_segment *cache_seg = first_seg(lv);
int cache_mode = cache_seg->cache_mode; int cache_mode = cache_seg->cache_mode;
int noflush = 0; int noflush = 0;
@ -1879,6 +1881,25 @@ static int _lvconvert_split_and_keep_cachevol(struct cmd_context *cmd,
if (!lv_detach_cache_vol(lv, noflush)) if (!lv_detach_cache_vol(lv, noflush))
return_0; return_0;
/* Cut off suffix _cvol */
if (!dm_strncpy(cvol_name, lv_fast->name, sizeof(cvol_name)) ||
!(c = strstr(cvol_name, "_cvol"))) {
/* likely older instance of metadata */
log_debug("LV %s has no suffix for cachevol (skipping rename).",
display_lvname(lv_fast));
} else {
*c = 0;
/* If the name is in use, generate new lvol%d */
if (lv_name_is_used_in_vg(lv->vg, cvol_name, NULL) &&
!generate_lv_name(lv->vg, "lvol%d", cvol_name, sizeof(cvol_name))) {
log_error("Failed to generate unique name for unused logical volume.");
return 0;
}
if (!lv_rename_update(cmd, lv_fast, cvol_name, 0))
return_0;
}
if (!vg_write(lv->vg) || !vg_commit(lv->vg)) if (!vg_write(lv->vg) || !vg_commit(lv->vg))
return_0; return_0;
@ -4193,6 +4214,7 @@ static int _lvconvert_cachevol_attach_single(struct cmd_context *cmd,
struct volume_group *vg = lv->vg; struct volume_group *vg = lv->vg;
struct logical_volume *cachevol_lv; struct logical_volume *cachevol_lv;
const char *cachevol_name; const char *cachevol_name;
char cvol_name[NAME_LEN];
if (!(cachevol_name = arg_str_value(cmd, cachevol_ARG, NULL))) if (!(cachevol_name = arg_str_value(cmd, cachevol_ARG, NULL)))
goto_out; goto_out;
@ -4238,6 +4260,13 @@ static int _lvconvert_cachevol_attach_single(struct cmd_context *cmd,
goto_out; goto_out;
/* Attach the cache to the main LV. */ /* Attach the cache to the main LV. */
if (dm_snprintf(cvol_name, sizeof(cvol_name), "%s_cvol", cachevol_lv->name) < 0) {
log_error("Can't prepare new metadata name for %s.", display_lvname(cachevol_lv));
return 0;
}
if (!lv_rename_update(cmd, cachevol_lv, cvol_name, 0))
return_0;
cachevol_lv->status |= LV_CACHE_VOL; cachevol_lv->status |= LV_CACHE_VOL;
if (!_cache_vol_attach(cmd, lv, cachevol_lv)) if (!_cache_vol_attach(cmd, lv, cachevol_lv))
goto_out; goto_out;