[ "$SLOW" = "no" ] && EXCEPT_SLOW="12 16 23 33a"
-SANITYLOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
FAIL_ON_ERROR=false
SETUP=${SETUP:-:}
TRACE=${TRACE:-""}
-[ "$SANITYLOG" ] && rm -f $SANITYLOG || true
-
check_and_setup_lustre
LOVNAME=`lctl get_param -n llite.*.lov.common_name | tail -n 1`
assert_DIR
rm -rf $DIR1/[df][0-9]* $DIR1/lnk
+SAMPLE_FILE=$TMP/$(basename $0 .sh).junk
+dd if=/dev/urandom of=$SAMPLE_FILE bs=1M count=1
+
# $RUNAS_ID may get set incorrectly somewhere else
[ $UID -eq 0 -a $RUNAS_ID -eq 0 ] && error "\$RUNAS_ID set to 0, but \$UID is also 0!"
remote_ost_nodsh && skip "remote OST with nodsh" && return
lfs setstripe $DIR1/$tfile -i 0 -c 1
- cp /etc/termcap $DIR1/$tfile
+ cp $SAMPLE_FILE $DIR1/$tfile
cancel_lru_locks osc > /dev/null
#define OBD_FAIL_ONCE|OBD_FAIL_LDLM_CREATE_RESOURCE 0x30a
do_facet ost1 lctl set_param fail_loc=0x8000030a
# OSC=`lctl dl | awk '/-osc-/ {print $4}' | head -n 1`
lctl --device %$OSC deactivate
lfs df -i || error "lfs df -i with deactivated OSC failed"
- lctl --device %$OSC recover
+ lctl --device %$OSC activate
lfs df || error "lfs df with reactivated OSC failed"
}
run_test 24a "lfs df [-ih] [path] test ========================="
local stat=0
for mds in ${mdts//,/ }; do
varsvc=${mds}_svc
- dev=$(basename $(do_facet $mds lctl get_param -n osd.${!varsvc}.mntdev))
+ dev=$(basename $(do_facet $mds lctl get_param -n osd*.${!varsvc}.mntdev))
val=$(do_facet $mds "procfile=/proc/fs/jbd/$dev/info;
[ -f \\\$procfile ] || procfile=/proc/fs/jbd2/$dev/info;
[ -f \\\$procfile ] || procfile=/proc/fs/jbd2/${dev}\:\\\*/info;
check_pdo_conflict() {
local pid=$1
local conflict=0
+ sleep 1 # to ensure OP1 is finished on client if OP2 is blocked by OP1
if [[ `ps --pid $pid | wc -l` == 1 ]]; then
conflict=1
echo "Conflict"
log "cleanup: ======================================================"
[ "$(mount | grep $MOUNT2)" ] && umount $MOUNT2
-check_and_cleanup_lustre
-echo '=========================== finished ==============================='
-[ -f "$SANITYLOG" ] && cat $SANITYLOG && grep -q FAIL $SANITYLOG && exit 1 || true
-echo "$0: completed"
+complete $(basename $0) $SECONDS
+check_and_cleanup_lustre
+exit_status