In test_24d, do not use the default mountpoint of copytool_setup()
as it is also the one the test mounts in read-only mode.
This patch also removes:
- the "continuing fast path" in copytool_setup (calling
"pkill -CONT -x lhsmtool_posix" instead of launching a new
copytool) as it is not explicitly used by any test
- as well as the first copytool_setup located outside of any
tests.
Test-Parameters: trivial testlist=sanity-hsm
Signed-off-by: Quentin Bouget <quentin.bouget@cea.fr>
Change-Id: I86bc41213bc656d7a83d63fb8e9bc595ba6b73ca
Reviewed-on: https://review.whamcloud.com/24185
Reviewed-by: Faccini Bruno <bruno.faccini@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
local agent=$(facet_active_host $facet)
local agent=$(facet_active_host $facet)
- if [[ -z "$arc_id" ]] &&
- do_facet $facet "pkill -CONT -x $HSMTOOL_BASE"; then
- echo "Only wakeup running copytool $facet on $agent"
- return 0
- fi
-
if $HSM_ARCHIVE_PURGE; then
echo "Purging archive on $agent"
do_facet $facet "rm -rf $hsm_root/$HSMTMP/*"
if $HSM_ARCHIVE_PURGE; then
echo "Purging archive on $agent"
do_facet $facet "rm -rf $hsm_root/$HSMTMP/*"
cdt_set_mount_state enabled
cdt_check_state enabled
cdt_set_mount_state enabled
cdt_check_state enabled
-echo "Start copytool"
-copytool_setup
-
echo "Set sanity-hsm HSM policy"
cdt_set_sanity_policy
echo "Set sanity-hsm HSM policy"
cdt_set_sanity_policy
local f=$DIR/$tdir/$tfile
local fid=$(make_small $f)
local f=$DIR/$tdir/$tfile
local fid=$(make_small $f)
$LFS hsm_archive $f || error "could not archive file"
wait_request_state $fid ARCHIVE SUCCEED
$LFS hsm_archive $f || error "could not archive file"
wait_request_state $fid ARCHIVE SUCCEED
check_hsm_flags $f "0x0000000d"
$MMAP_CAT $f > /dev/null || error "failed mmap & cat release file"
check_hsm_flags $f "0x0000000d"
$MMAP_CAT $f > /dev/null || error "failed mmap & cat release file"
}
run_test 1a "mmap & cat a HSM released file"
}
run_test 1a "mmap & cat a HSM released file"
cleanup_test_24d() {
trap 0
mount -o remount,rw $MOUNT2
cleanup_test_24d() {
trap 0
mount -o remount,rw $MOUNT2
+ zconf_umount $(facet_host $SINGLEAGT) "$MOUNT3"
mkdir -p $DIR/$tdir
rm -f $file1
fid1=$(make_small $file1)
trap cleanup_test_24d EXIT
mkdir -p $DIR/$tdir
rm -f $file1
fid1=$(make_small $file1)
trap cleanup_test_24d EXIT
+ zconf_mount $(facet_host $SINGLEAGT) "$MOUNT3" ||
+ error "cannot mount '$MOUNT3' on '$SINGLEAGT'"
+ copytool_setup $SINGLEAGT "$MOUNT3" ||
+ error "unable to setup a copytool for the test"
mount -o remount,ro $MOUNT2
mount -o remount,ro $MOUNT2