export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/utils:$PATH:/sbin:/usr/sbin
ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 3815
+# bug number for skipped test: LU-3815
ALWAYS_EXCEPT="$SANITY_HSM_EXCEPT 34 35 36"
-# bug number for skipped test:4178 4176
-ALWAYS_EXCEPT="$ALWAYS_EXCEPT 200 221 223b 31a"
+# bug number for skipped test:LU-4178
+ALWAYS_EXCEPT="$ALWAYS_EXCEPT 200 221 223b"
# bug number for skipped test:LU-3852
ALWAYS_EXCEPT="$ALWAYS_EXCEPT 251"
# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
MULTIOP=${MULTIOP:-multiop}
OPENFILE=${OPENFILE:-openfile}
-MCREATE=${MCREATE:-mcreate}
MOUNT_2=${MOUNT_2:-"yes"}
FAIL_ON_ERROR=false
if [[ -z "$arc_id" ]] &&
do_facet $facet "pkill -CONT -x $HSMTOOL_BASE"; then
- echo "Wakeup copytool $facet on $agent"
+ echo "Only wakeup running copytool $facet on $agent"
return 0
fi
local oldstate
local mdt_hsmctrl
local hsm_root=$(copytool_device $facet)
+ local end_wait=$(( SECONDS + TIMEOUT ))
do_nodesv $agents "pkill -INT -x $HSMTOOL_BASE" || return 0
- sleep 1
- echo "Copytool is stopped on $agents"
+
+ while (( SECONDS < end_wait )); do
+ sleep 2
+ do_nodesv $agents "pgrep -x $HSMTOOL_BASE"
+ if [ $? -ne 0 ]; then
+ echo "Copytool is stopped on $agents"
+ break
+ fi
+ echo "Copytool still running on $agents"
+ done
+ if do_nodesv $agents "pgrep -x $HSMTOOL_BASE"; then
+ error "Copytool failed to stop in ${TIMEOUT}s ..."
+ else
+ echo "Copytool has stopped in " \
+ "$((TIMEOUT - (end_wait - SECONDS)))s."
+ fi
# clean all CDTs orphans requests from previous tests
# that would otherwise need to timeout to clear.
"$oldstate" 20 ||
error "mds${mdtno} cdt state is not $oldstate"
done
- do_facet $facet "rm -rf $hsm_root"
+ if do_facet $facet "df $hsm_root" >/dev/null 2>&1 ; then
+ do_facet $facet "rm -rf $hsm_root/*"
+ fi
}
copytool_suspend() {
done
# force copytool to use a local/temp archive dir to ensure best
# performance vs remote/NFS mounts used in auto-tests
- if df --local $HSM_ARCHIVE >/dev/null 2>&1 ; then
+ if do_facet $SINGLEAGT "df --local $HSM_ARCHIVE" >/dev/null 2>&1 ; then
copytool_setup
else
copytool_setup $SINGLEAGT $MOUNT $HSM_ARCHIVE_NUMBER $TMP/$tdir
test_60() {
# This test validates the fix for LU-4512. Ensure that the -u
- # option changes the progress reporting interval from the default
- # (30 seconds) to the user-specified interval.
+ # option changes the progress reporting interval from the
+ # default (30 seconds) to the user-specified interval.
local interval=5
- local progress_timeout=$((interval * 3))
+ local progress_timeout=$((interval * 4))
# test needs a new running copytool
copytool_cleanup
local f=$DIR/$tdir/$tfile
local fid=$(make_large_for_progress $f)
- local start_at=$(date +%s)
- $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f ||
- error "could not archive file"
-
local mdtidx=0
local mdt=${MDT_PREFIX}${mdtidx}
local mds=mds$((mdtidx + 1))
+ # Wait for copytool to register
+ wait_update_facet $mds \
+ "$LCTL get_param -n ${mdt}.hsm.agents | grep -o ^uuid" \
+ uuid 100 || error "coyptool failed to register with $mdt"
+
+ local start_at=$(date +%s)
+ $LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $f ||
+ error "could not archive file"
+
local cmd="$LCTL get_param -n ${mdt}.hsm.active_requests"
cmd+=" | awk '/'$fid'.*action=ARCHIVE/ {print \\\$12}' | cut -f2 -d="
# Just start and stop the copytool to generate events.
cdt_clear_no_retry
+
+ # Wait for the copytool to register.
+ wait_update --verbose $(facet_active_host mds1) \
+ "$LCTL get_param -n ${MDT_PREFIX}0.hsm.agents | grep -o ^uuid" \
+ uuid 100 ||
+ error "copytool failed to register with MDT0000"
+
copytool_cleanup
local REGISTER_EVENT
fid=$(copy_file /etc/hosts $f.$i)
echo $f.$i >> $FILELIST
done
- copytool_setup
+ # force copytool to use a local/temp archive dir to ensure best
+ # performance vs remote/NFS mounts used in auto-tests
+ if do_facet $SINGLEAGT "df --local $HSM_ARCHIVE" >/dev/null 2>&1 ; then
+ copytool_setup
+ else
+ local dai=$(get_hsm_param default_archive_id)
+ copytool_setup $SINGLEAGT $MOUNT $dai $TMP/$tdir
+ fi
# to be sure wait_all_done will not be mislead by previous tests
cdt_purge
wait_for_grace_delay