From 8eefba44596ea31f8890de8761ef9f556b12b113 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Fri, 7 Dec 2018 19:56:49 +0100 Subject: [PATCH] lvcreate/lvconvert: prohibit creation of/conversion to mirrored mirror logs In RHEL7 we marked mirrored mirror logs as deprecated and added a related message. This patch prohibits creating new 'mirror' LVs with that log type or converting existing LVs to have one. Existing LVs with mirrored mirror log can be activated and converted to disk/core logs. Avoid double deprecation message when running lvconvert. Resolves: rhbz1643562 --- lib/metadata/mirror.c | 3 ++- tools/lvconvert.c | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index ba3f33dd1..8b2097949 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -1908,7 +1908,8 @@ int add_mirror_log(struct cmd_context *cmd, struct logical_volume *lv, } if (log_count > 1) { - log_warn("WARNING: Log type \"mirrored\" is DEPRECATED and will be removed in the future. Use RAID1 LV or disk log instead."); + log_err("Log type \"mirrored\" is DEPRECATED. Use RAID1 LV or disk log instead."); + return 0; } if (!(parallel_areas = build_parallel_areas_from_lv(lv, 0, 0))) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index c16880e4a..5bdd50fe2 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1261,11 +1261,6 @@ static int _lvconvert_mirrors(struct cmd_context *cmd, (old_log_count == new_log_count)) return 1; - if ((old_log_count != new_log_count) && - (new_log_count == MIRROR_LOG_MIRRORED)) { - log_warn("WARNING: Log type \"mirrored\" is DEPRECATED and will be removed in the future. Use RAID1 LV or disk log instead."); - } - if (!_lvconvert_mirrors_aux(cmd, lv, lp, NULL, new_mimage_count, new_log_count, lp->pvh)) return_0;