From: Niu Yawei Date: Fri, 16 Nov 2012 10:50:13 +0000 (-0500) Subject: LU-2345 tests: remove $FSTYPE from tests X-Git-Tag: 2.3.57~54 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=55b8a464fc8a101ae7ceeb6b40f2e3c6f51d7b6e LU-2345 tests: remove $FSTYPE from tests $FSTYPE is deprecated, it should be replaced by facet_fstype. Signed-off-by: Niu Yawei Change-Id: I6671249c88a53b01badebd7172fb3307c8f4f48b Reviewed-on: http://review.whamcloud.com/4596 Tested-by: Hudson Reviewed-by: Li Wei Tested-by: Maloo Reviewed-by: Johann Lombardi --- diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 49d0aa1..6a25571 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -1228,7 +1228,7 @@ test_32newtarball() { sed -e 's/\./_/g') # E.g., "1.8.7" -> "1_8" dst=$(cd $dst; pwd) pushd $tmp/img - tar cjvf $dst/disk$version-$FSTYPE.tar.bz2 -S * + tar cjvf $dst/disk$version-$(facet_fstype $SINGLEMDS).tar.bz2 -S * popd rm -r $tmp @@ -1253,9 +1253,8 @@ t32_check() { exit 0 fi - local IMGTYPE=$FSTYPE + local IMGTYPE=$(facet_fstype $SINGLEMDS) - [ ! -z "$MDSFSTYPE" ] && IMGTYPE=$MDSFSTYPE tarballs=$($r find $RLUSTRE/tests -maxdepth 1 -name \'disk*-$IMGTYPE.tar.bz2\') if [ -z "$tarballs" ]; then @@ -1303,7 +1302,8 @@ t32_reload_modules() { while ((i < 20)); do echo "Unloading modules on $node: Attempt $i" - do_rpc_nodes $node $LUSTRE_RMMOD $FSTYPE && all_removed=true + do_rpc_nodes $node $LUSTRE_RMMOD $(facet_fstype $SINGLEMDS) && + all_removed=true do_rpc_nodes $node check_mem_leak || return 1 if $all_removed; then load_modules diff --git a/lustre/tests/large-lun.sh b/lustre/tests/large-lun.sh index 1ce6bfe..d65bfb9 100644 --- a/lustre/tests/large-lun.sh +++ b/lustre/tests/large-lun.sh @@ -141,8 +141,8 @@ test_2 () { $(ostdevname $num) > /dev/null || error "format ost${num} error" run_dumpe2fs ost${num} $dev - do_facet ost${num} mount -t $FSTYPE $dev $ostmnt \ - "$OST_MOUNT_OPTS" + do_facet ost${num} mount -t $(facet_fstype ost${num}) $dev \ + $ostmnt "$OST_MOUNT_OPTS" # Run llverfs on the mounted ldiskfs filesystem in partial mode # to ensure that the kernel can perform filesystem operations @@ -162,8 +162,8 @@ test_2 () { if $FULL_MODE; then log "full mode, mount the OST $dev as a ldiskfs again" - do_facet ost${num} mount -t $FSTYPE $dev $ostmnt \ - "$OST_MOUNT_OPTS" + do_facet ost${num} mount -t $(facet_fstype ost${num}) \ + $dev $ostmnt "$OST_MOUNT_OPTS" cleanup_dirs ost${num} $ostmnt do_facet ost${num} "sync" diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh index 701c0db..5188809 100644 --- a/lustre/tests/sanity-gss.sh +++ b/lustre/tests/sanity-gss.sh @@ -17,7 +17,7 @@ CPU=`awk '/model/ {print $4}' /proc/cpuinfo` [ "$CPU" = "UML" ] && EXCEPT="$EXCEPT" case `uname -r` in -2.6*) FSTYPE=${FSTYPE:-ldiskfs}; ALWAYS_EXCEPT="$ALWAYS_EXCEPT " ;; +2.6*) ALWAYS_EXCEPT="$ALWAYS_EXCEPT " ;; *) error "unsupported kernel (gss only works with 2.6.x)" ;; esac diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 10e3c11..2f80fe0 100644 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -193,11 +193,14 @@ getquota() { set_mdt_qtype() { local qtype=$1 local varsvc=${SINGLEMDS}_svc + local cmd do_facet mgs $LCTL conf_param $FSNAME.quota.mdt=$qtype if $(facet_up $SINGLEMDS); then - wait_update_facet $SINGLEMDS "$LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.enabled" "$qtype" || - return 1 + cmd="$LCTL get_param -n " + cmd=${cmd}osd-$(facet_fstype $SINGLEMDS).${!varsvc} + cmd=${cmd}.quota_slave.enabled + + wait_update_facet $SINGLEMDS "$cmd" "$qtype" || return 1 fi return 0 } @@ -208,14 +211,17 @@ set_ost_qtype() { local qtype=$1 local varsvc local osts=$(get_facets OST) + local cmd do_facet mgs $LCTL conf_param $FSNAME.quota.ost=$qtype # we have to make sure each OST received config changes for ost in ${osts//,/ }; do varsvc=${ost}_svc + cmd="$LCTL get_param -n " + cmd=${cmd}osd-$(facet_fstype $ost).${!varsvc} + cmd=${cmd}.quota_slave.enabled + if $(facet_up $ost); then - wait_update_facet $ost "$LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.enabled" \ - "$qtype" || return 1 + wait_update_facet $ost "$cmd" "$qtype" || return 1 fi done return 0 @@ -226,12 +232,16 @@ wait_reintegration() { local qtype=$2 local result="glb[1],slv[1],reint[0]" local varsvc + local cmd if [ $ntype == "mdt" ]; then varsvc=${SINGLEMDS}_svc + cmd="$LCTL get_param -n " + cmd=${cmd}osd-$(facet_fstype $SINGLEMDS).${!varsvc} + cmd=${cmd}.quota_slave.info + if $(facet_up $SINGLEMDS); then - wait_update_facet $SINGLEMDS "$LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.info | + wait_update_facet $SINGLEMDS "$cmd | grep "$qtype" | awk '{ print \\\$3 }'" "$result" || return 1 fi @@ -239,9 +249,12 @@ wait_reintegration() { local osts=$(get_facets OST) for ost in ${osts//,/ }; do varsvc=${ost}_svc + cmd="$LCTL get_param -n " + cmd=${cmd}osd-$(facet_fstype $ost).${!varsvc} + cmd=${cmd}.quota_slave.info + if $(facet_up $ost); then - wait_update_facet $ost "$LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.info | + wait_update_facet $ost "$cmd | grep "$qtype" | awk '{ print \\\$3 }'" \ "$result" || return 1 fi diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 87d3026..7f9bdef 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -4983,7 +4983,7 @@ test_80() { # bug 10718 local soc="obdfilter.*.sync_on_lock_cancel" local soc_old=$(do_facet ost1 lctl get_param -n $soc | head -n1) local hosts= - if [ "$soc_old" != "never" -a "$FSTYPE" != "ldiskfs" ]; then + if [ "$soc_old" != "never" -a "$(facet_fstype ost1)" != "ldiskfs" ]; then hosts=$(for host in $(seq -f "ost%g" 1 $OSTCOUNT); do facet_active_host $host; done | sort -u) do_nodes $hosts lctl set_param $soc=never @@ -9795,7 +9795,8 @@ run_test 227 "running truncated executable does not cause OOM" # LU-1512 try to reuse idle OI blocks test_228a() { - [ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return + [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + skip "non-ldiskfs backend" && return local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -9834,7 +9835,8 @@ test_228a() { run_test 228a "try to reuse idle OI blocks" test_228b() { - [ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return + [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + skip "non-ldiskfs backend" && return local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -9881,7 +9883,8 @@ run_test 228b "idle OI blocks can be reused after MDT restart" #LU-1881 test_228c() { - [ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return + [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + skip "non-ldiskfs backend" && return local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index de35da9..fd15b4c 100644 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -332,7 +332,7 @@ COUNT=${COUNT:-2500} # The FSXNUM reduction for ZFS is needed until ORI-487 is fixed. # We don't want to skip it entirely, but ZFS is VERY slow and cannot # pass a 2500 operation dual-mount run within the time limit. -if [ "$OSTFSTYPE" = "zfs" ]; then +if [ "$(facet_fstype ost1)" = "zfs" ]; then FSXNUM=$((COUNT / 5)) FSXP=1 elif [ "$SLOW" = "yes" ]; then diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 7baca91..7bf44ab 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1120,7 +1120,7 @@ setup_quota_old(){ mdt_quota_type() { local varsvc=${SINGLEMDS}_svc do_facet $SINGLEMDS $LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.enabled + osd-$(facet_fstype $SINGLEMDS).${!varsvc}.quota_slave.enabled } # get ost quota type @@ -1128,7 +1128,7 @@ ost_quota_type() { # All OSTs should have same quota type local varsvc=ost1_svc do_facet ost1 $LCTL get_param -n \ - osd-$FSTYPE.${!varsvc}.quota_slave.enabled + osd-$(facet_fstype ost1).${!varsvc}.quota_slave.enabled } # restore old quota type settings