From f540a18fd7f5f65599a6c85c0bd3ba84e54f1cc8 Mon Sep 17 00:00:00 2001

From: Marian Csontos <mcsontos@redhat.com>

Date: Thu, 28 May 2020 18:02:16 +0200

Subject: [PATCH] Merge master up to commit be61bd6ff5c6

---

 VERSION                           |  2 +-

 VERSION_DM                        |  2 +-

 test/shell/cache-single-usage.sh  | 13 +++++++++++++

 test/shell/integrity-dmeventd.sh  |  8 ++++++++

 test/shell/integrity-large.sh     |  8 ++++++++

 test/shell/integrity-misc.sh      |  8 ++++++++

 test/shell/integrity.sh           |  8 ++++++++

 test/shell/thin-foreign-repair.sh | 14 ++++++++++----

 tools/lvconvert.c                 | 15 +++++++++++++++

 9 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION

index 00618e0..9ad7a70 100644

--- a/VERSION

+++ b/VERSION

@@ -1 +1 @@

-2.03.09(2)-RHEL8 (2020-04-21)

+2.03.09(2)-RHEL8 (2020-05-28)

diff --git a/VERSION_DM b/VERSION_DM

index b9ec43e..bcd97de 100644

--- a/VERSION_DM

+++ b/VERSION_DM

@@ -1 +1 @@

-1.02.171-RHEL8 (2020-04-21)

+1.02.171-RHEL8 (2020-05-28)

diff --git a/test/shell/cache-single-usage.sh b/test/shell/cache-single-usage.sh

index a885bf7..8936aa3 100644

--- a/test/shell/cache-single-usage.sh

+++ b/test/shell/cache-single-usage.sh

@@ -127,4 +127,17 @@ umount "$mount_dir"

 lvchange -an $vg/$lv1

 lvchange -an $vg/$lv2

+# misc tests

+

+lvremove $vg

+

+lvcreate -n $lv1 -l 2 -an $vg "$dev1"

+lvcreate -n $lv2 -l 2 -an $vg "$dev1"

+lvcreate -n $lv3 -l 2 -an $vg "$dev2"

+

+lvconvert -y --type writecache --cachevol $lv3 $vg/$lv1

+not lvconvert -y --type writecache --cachevol ${lv3}_cvol $vg/$lv2

+not lvconvert -y --type cache --cachevol ${lv3}_cvol $vg/$lv2

+not lvconvert -y --type cache --cachepool ${lv3}_cvol $vg/$lv2

+

 vgremove -ff $vg

diff --git a/test/shell/integrity-dmeventd.sh b/test/shell/integrity-dmeventd.sh

index ed2436a..296f556 100644

--- a/test/shell/integrity-dmeventd.sh

+++ b/test/shell/integrity-dmeventd.sh

@@ -109,6 +109,14 @@ _wait_recalc() {

 		sleep 1

 	done

+	# TODO: There is some strange bug, first leg of RAID with integrity

+	# enabled never gets in sync. I saw this in BB, but not when executing

+	# the commands manually

+	if test -z "$sync"; then

+		echo "TEST WARNING: Resync of dm-integrity device '$checklv' failed"

+                dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"

+		exit

+	fi

 	echo "timeout waiting for recalc"

 	return 1

 }

diff --git a/test/shell/integrity-large.sh b/test/shell/integrity-large.sh

index 7a333c1..5aba80e 100644

--- a/test/shell/integrity-large.sh

+++ b/test/shell/integrity-large.sh

@@ -95,6 +95,14 @@ _wait_recalc() {

 		sleep 1

 	done

+	# TODO: There is some strange bug, first leg of RAID with integrity

+	# enabled never gets in sync. I saw this in BB, but not when executing

+	# the commands manually

+	if test -z "$sync"; then

+		echo "TEST WARNING: Resync of dm-integrity device '$checklv' failed"

+                dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"

+		exit

+	fi

 	echo "timeout waiting for recalc"

 	return 1

 }

diff --git a/test/shell/integrity-misc.sh b/test/shell/integrity-misc.sh

index a176f18..0d05689 100644

--- a/test/shell/integrity-misc.sh

+++ b/test/shell/integrity-misc.sh

@@ -109,6 +109,14 @@ _wait_recalc() {

 		sleep 1

 	done

+	# TODO: There is some strange bug, first leg of RAID with integrity

+	# enabled never gets in sync. I saw this in BB, but not when executing

+	# the commands manually

+	if test -z "$sync"; then

+		echo "TEST WARNING: Resync of dm-integrity device '$checklv' failed"

+                dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"

+		exit

+	fi

 	echo "timeout waiting for recalc"

 	return 1

 }

diff --git a/test/shell/integrity.sh b/test/shell/integrity.sh

index 6baccf0..77e9430 100644

--- a/test/shell/integrity.sh

+++ b/test/shell/integrity.sh

@@ -204,6 +204,14 @@ _wait_recalc() {

 		sleep 1

 	done

+	# TODO: There is some strange bug, first leg of RAID with integrity

+	# enabled never gets in sync. I saw this in BB, but not when executing

+	# the commands manually

+	if test -z "$sync"; then

+		echo "TEST WARNING: Resync of dm-integrity device '$checklv' failed"

+                dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"

+		exit

+	fi

 	echo "timeout waiting for recalc"

 	return 1

 }

diff --git a/test/shell/thin-foreign-repair.sh b/test/shell/thin-foreign-repair.sh

index 8b4018e..55e9f62 100644

--- a/test/shell/thin-foreign-repair.sh

+++ b/test/shell/thin-foreign-repair.sh

@@ -17,9 +17,15 @@ SKIP_WITH_LVMPOLLD=1

 . lib/inittest

+clean_thin_()

+{

+	aux udev_wait

+	dmsetup remove "$THIN" || { sleep .5 ; dmsetup remove "$THIN" ; }

+}

+

 cleanup_mounted_and_teardown()

 {

-	dmsetup remove $THIN || true

+	clean_thin_ || true

 	vgremove -ff $vg

 	aux teardown

 }

@@ -56,9 +62,7 @@ dmsetup create "$THIN" --table "0 40960 thin $DM_DEV_DIR/mapper/$POOL 0"

 mkfs.ext4 "$DM_DEV_DIR/mapper/$THIN"

-aux udev_wait

-

-dmsetup remove "$THIN" || { sleep .5 ; dmsetup remove "$THIN" }

+clean_thin_

 lvchange -an $vg/pool

@@ -72,3 +76,5 @@ lvchange -ay $vg/pool

 dmsetup create "$THIN" --table "0 40960 thin $DM_DEV_DIR/mapper/$POOL 0"

 fsck -n "$DM_DEV_DIR/mapper/$THIN"

+

+# exit calls cleanup_mounted_and_teardown

diff --git a/tools/lvconvert.c b/tools/lvconvert.c

index cf93538..8652252 100644

--- a/tools/lvconvert.c

+++ b/tools/lvconvert.c

@@ -4264,6 +4264,11 @@ static int _lvconvert_cachevol_attach_single(struct cmd_context *cmd,

 		goto out;

 	}

+	if (lv_is_cache_vol(cachevol_lv)) {

+		log_error("LV %s is already used as a cachevol.", display_lvname(cachevol_lv));

+		goto out;

+	}

+

 	/* Ensure the LV is not active elsewhere. */

 	if (!lockd_lv(cmd, lv, "ex", 0))

 		goto_out;

@@ -4347,6 +4352,11 @@ static int _lvconvert_cachepool_attach_single(struct cmd_context *cmd,

 			goto out;

 		}

+		if (lv_is_cache_vol(cachepool_lv)) {

+			log_error("LV %s is already used as a cachevol.", display_lvname(cachepool_lv));

+			goto out;

+		}

+

 		if (cachepool_lv == lv) {

 			log_error("Use a different LV for cache pool LV and cache LV %s.",

 				  display_lvname(cachepool_lv));

@@ -5629,6 +5639,11 @@ static int _lvconvert_writecache_attach_single(struct cmd_context *cmd,

 		goto bad;

 	}

+	if (lv_is_cache_vol(lv_fast)) {

+		log_error("LV %s is already used as a cachevol.", display_lvname(lv_fast));

+		goto bad;

+	}

+

 	/*

 	 * To permit this we need to check the block size of the fs using lv

 	 * (recently in libblkid) so that we can use a matching writecache

-- 

1.8.3.1