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

test: Drop --mirrorlog when not a mirror.

Browse Source
This commit is contained in:
Alasdair G Kergon 2016-08-08 18:43:54 +01:00
parent fc93085c7a
commit 175e0905d5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/shell/lvconvert-mirror-basic.sh
View File

@ -97,7 +97,15 @@ test_lvconvert() {
alloc="--alloc anywhere"
fi
lvconvert --type mirror -m $finish_count --mirrorlog $finish_log_type \
# --mirrorlog is invalid with -m0
if [ "$finish_count" -eq 0 ]; then
mirrorlog=""
finish_log_type=""
else
mirrorlog="--mirrorlog"
fi
lvconvert --type mirror -m $finish_count $mirrorlog $finish_log_type \
$vg/$lv1 $alloc
test $active || lvchange -aey $vg/$lv1

6
tools/lvconvert.c
View File

@ -1700,8 +1700,8 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
uint32_t new_mimage_count;
uint32_t new_log_count;
if (*lp->type_str && strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) {
log_error("--corelog and --mirrorlog is only compatible with --type mirror");
if ((lp->corelog || lp->mirrorlog) && *lp->type_str && strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) {
log_error("--corelog and --mirrorlog are only compatible with mirror devices");
return 0;
}
@ -1894,7 +1894,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
}
if ((lp->corelog || lp->mirrorlog) && strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) {
log_error("--corelog and --mirrorlog is only compatible with --type mirror");
log_error("--corelog and --mirrorlog are only compatible with mirror devices");
return 0;
}