}
run_test 38 "open a regular file with O_DIRECTORY should return -ENOTDIR ==="
-test_39() {
+test_39a() { # was test_39
touch $DIR/$tfile
touch $DIR/${tfile}2
# ls -l $DIR/$tfile $DIR/${tfile}2
error "O_TRUNC didn't change timestamps"
fi
}
-run_test 39 "mtime changed on create ==========================="
+run_test 39a "mtime changed on create ==========================="
test_39b() {
test_mkdir -p -c1 $DIR/$tdir
}
run_test 42e "verify sub-RPC writes are not done synchronously"
-test_43() {
+test_43A() { # was test_43
test_mkdir -p $DIR/$tdir
cp -p /bin/ls $DIR/$tdir/$tfile
$MULTIOP $DIR/$tdir/$tfile Ow_c &
$DIR/$tdir/$tfile && error || true
kill -USR1 $pid
}
-run_test 43 "execution of file opened for write should return -ETXTBSY"
+run_test 43A "execution of file opened for write should return -ETXTBSY"
test_43a() {
[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
}
run_test 43c "md5sum of copy into lustre========================"
-test_44() {
+test_44A() { # was test_44
[[ $OSTCOUNT -lt 2 ]] && skip_env "skipping 2-stripe test" && return
dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=1023
dd if=$DIR/f1 bs=4k count=1 > /dev/null
}
-run_test 44 "zero length read from a sparse stripe ============="
+run_test 44A "zero length read from a sparse stripe ============="
test_44a() {
local nstripe=$($LCTL lov_getconfig $DIR | grep default_stripe_count: |
SAVE_UMASK=$(umask)
umask 0022
- cd $DIR
+ mkdir -p $DIR/$tdir
+ cd $DIR/$tdir
echo "performing cp ..."
run_acl_subtest cp || error "run_acl_subtest cp failed"
stat $DIR/$tdir $DIR/$tdir/f1 > /dev/null
# XXX client can not do early lock cancel of OST lock
# during unlink (LU-4206), so cancel osc lock now.
+ sleep 2
cancel_lru_locks osc
can1=$(do_facet $SINGLEMDS \
"$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 > /dev/null
# XXX client can not do early lock cancel of OST lock
# during rename (LU-4206), so cancel osc lock now.
+ sleep 2
cancel_lru_locks osc
can1=$(do_facet $SINGLEMDS \
"$LCTL get_param -n ldlm.services.ldlm_canceld.stats" |
cmd="mv -f $DIR/$tfile $DIR/$tdir.rename"
verify_jobstats "$cmd" "$SINGLEMDS"
# jobstats expiry - sleep until old stats should be expired
- local left=$((interval_new + 2 - (SECONDS - start)))
- [ $left -ge 0 ] && echo "sleep $left for expiry" && sleep $((left + 1))
+ local left=$((interval_new + 5 - (SECONDS - start)))
+ [ $left -ge 0 ] && wait_update_facet $SINGLEMDS \
+ "lctl get_param *.*.job_stats | grep -c 'job_id.*mkdir'" \
+ "0" $left
cmd="mkdir $DIR/$tdir.expire"
verify_jobstats "$cmd" "$SINGLEMDS"
[ $(do_facet $SINGLEMDS lctl get_param *.*.job_stats |
done
}
-test_241() {
+test_241a() { # was test_241
dd if=/dev/zero of=$DIR/$tfile count=1 bs=40960
ls -la $DIR/$tfile
cancel_lru_locks osc
test_241_dio 1000
wait $PID
}
-run_test 241 "bio vs dio"
+run_test 241a "bio vs dio"
test_241b() {
dd if=/dev/zero of=$DIR/$tfile count=1 bs=40960