local save="$TMP/$TESTSUITE-$TESTNAME.parameters"
save_lustre_params client "llite.*.xattr_cache" > $save
lctl set_param llite.*.xattr_cache=0
- stack_trap "restore_lustre_params < $save" EXIT
+ stack_trap "restore_lustre_params < $save; rm -f $save" EXIT
# single-threaded write
echo "Test SOM for single-threaded write"
local save="$TMP/$TESTSUITE-$TESTNAME.parameters"
save_lustre_params client "llite.*.xattr_cache" > $save
lctl set_param llite.*.xattr_cache=0
- stack_trap "restore_lustre_params < $save" EXIT
+ stack_trap "restore_lustre_params < $save; rm -f $save" EXIT
rm -rf $DIR/$tdir || error "rm $tdir failed"
mkdir -p $DIR/$tdir || error "mkdir $tdir failed"
}
test_32a() { # bug 11270
- local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
+ local save="$TMP/$TESTSUITE-$TESTNAME.parameters"
local stripe_size=$(do_facet $SINGLEMDS \
"$LCTL get_param -n lod.$(facet_svc $SINGLEMDS)*.stripesize")
- save_lustre_params client "$OSC.*.lockless_truncate" > $p
+ save_lustre_params client "$OSC.*.lockless_truncate" > $save
+ # restore lockless_truncate default values on exit
+ stack_trap "restore_lustre_params < $save; rm -f $save" EXIT
cancel_lru_locks $OSC
enable_lockless_truncate 1
rm -f $DIR1/$tfile
$CHECKSTAT -s 3000000 $DIR1/$tfile || error "wrong file size"
[ $(calc_stats $OSC.*.${OSC}_stats lockless_truncate) -eq 0 ] ||
error "lockless truncate disabling failed"
- rm $DIR1/$tfile
- # restore lockless_truncate default values
- restore_lustre_params < $p
- rm -f $p
+ rm -f $DIR1/$tfile
}
run_test 32a "lockless truncate"