From: Jeffle Xu Date: Fri, 12 Jun 2020 05:18:20 +0000 (+0800) Subject: common/dmthin: modify DMTHIN_POOL_NAME X-Git-Tag: v2022.05.01~770 X-Git-Url: https://git.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=d6367ec8d2c603f43f5f5dba2d075892e4c3222f common/dmthin: modify DMTHIN_POOL_NAME _dmthin_set_queue() gets $cluster_size by 'dmsetup table | grep $DMTHIN_POOL_NAME'. The original name 'thin-pool' is accidently the same as the fourth field of the output of 'dmsetup table'. For example, vg-pool-tpool: 0 64864256 thin-pool 252:0 252:1 128 0 0 Thus if there is other thin-pool in the test environment, except for the thin-pool created by _dmthin_init(), the parsed $cluster_size may be a multi-line string, which is unexpected. This issue caused a failure of generic/347 and generic/500, while the dmesg reports 'Invalid argument count'. Signed-off-by: Jeffle Xu Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/common/dmthin b/common/dmthin index 61dd6f89..c58c3948 100644 --- a/common/dmthin +++ b/common/dmthin @@ -15,7 +15,7 @@ DMTHIN_DATA_DEV="/dev/mapper/$DMTHIN_DATA_NAME" DMTHIN_META_NAME="thin-meta" DMTHIN_META_DEV="/dev/mapper/$DMTHIN_META_NAME" # Backing pool dev (combination of above) -DMTHIN_POOL_NAME="thin-pool" +DMTHIN_POOL_NAME="thin-provision-pool" DMTHIN_POOL_DEV="/dev/mapper/$DMTHIN_POOL_NAME" # Thin volume DMTHIN_VOL_NAME="thin-vol"