From 185251325971a8111f3e821cde4f18f9533f8746 Mon Sep 17 00:00:00 2001 From: Sushant Mane Date: Fri, 12 May 2017 09:39:32 +0530 Subject: [PATCH 1/1] LU-8730 test: Remove duplicate $dev from conf-sanity test_83 Remove duplicate $dev variable passed to add function, which passes it as argument to mkfs.lustre. mkfs.lustre utility in Lustre 2.1 throws error when multiple device names passed to it. Skip test if OSTs are not ldiskfs-based. Test-Parameters: trivial envdefinitions=ONLY=83 testlist=conf-sanity Change-Id: I56535aac27e25bbf359bda835b24a56a4101c8ed Seagate-bug-id: MRP-2239 Signed-off-by: Ashish Maurya Signed-off-by: Sushant Mane Reviewed-on: http://es-gerrit.xyus.xyratex.com:8080/9425 Tested-by: Jenkins Reviewed-by: Sergey Cheremencev Reviewed-by: Ujjwal Lanjewar Tested-by: Elena V. Gryaznova Signed-off-by: Ashish Maurya Reviewed-on: https://review.whamcloud.com/23249 Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 0a8957e..ac29af6 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -5928,8 +5928,8 @@ run_test 82b "specify OSTs for file with --pool and --ost-list options" test_83() { [[ $(lustre_version_code ost1) -ge $(version_code 2.6.91) ]] || { skip "Need OST version at least 2.6.91" && return 0; } - if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then - skip "Only applicable to ldiskfs-based MDTs" + if [ $(facet_fstype ost1) != ldiskfs ]; then + skip "Only applicable to ldiskfs-based OSTs" return fi @@ -5945,7 +5945,7 @@ test_83() { # Mount the OST as an ldiskfs filesystem. log "mount the OST $dev as a $fstype filesystem" add ost1 $(mkfs_opts ost1 $dev) $FSTYPE_OPT \ - --reformat $dev $dev > /dev/null || + --reformat $dev > /dev/null || error "format ost1 error" if ! test -b $dev; then -- 1.8.3.1