LU-5162 mdc: Add exception entry check for radix_tree

[fs/lustre-release.git] / lustre / tests / sanity-hsm.sh

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 0e4735f..954f195 100755 (executable)
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -105,6 +105,9 @@ init_agt_vars() {
 
        # archive is purged at copytool setup
        HSM_ARCHIVE_PURGE=true
+
+       # Don't allow copytool error upon start/setup
+       HSMTOOL_NOERROR=false
 }
 
 # Get the backend root path for the given agent facet.
@@ -239,8 +242,13 @@ copytool_setup() {
        [[ -z "$TESTNAME" ]] || prefix=$prefix.$TESTNAME
        local copytool_log=$prefix.copytool${arc_id}_log.$agent.log
 
-       do_facet $facet "$cmd < /dev/null > $copytool_log 2>&1" ||
-               error "start copytool $facet on $agent failed"
+       do_facet $facet "$cmd < /dev/null > $copytool_log 2>&1"
+       if [[ $? !=  0 ]]; then
+               [[ $HSMTOOL_NOERROR == true ]] ||
+                       error "start copytool $facet on $agent failed"
+               echo "start copytool $facet on $agent failed"
+       fi
+
        trap cleanup EXIT
 }
 
@@ -257,11 +265,13 @@ get_copytool_event_log() {
 
 copytool_cleanup() {
        trap - EXIT
-       local agents=${1:-$(facet_active_host $SINGLEAGT)}
+       local facet=$SINGLEAGT
+       local agents=${1:-$(facet_active_host $facet)}
        local mdtno
        local idx
        local oldstate
        local mdt_hsmctrl
+       local hsm_root=$(copytool_device $facet)
 
        do_nodesv $agents "pkill -INT -x $HSMTOOL_BASE" || return 0
        sleep 1
@@ -286,6 +296,7 @@ copytool_cleanup() {
                        "$oldstate" 20 ||
                        error "mds${mdtno} cdt state is not $oldstate"
        done
+       do_facet $facet "rm -rf $hsm_root"
 }
 
 copytool_suspend() {
@@ -983,7 +994,7 @@ test_10d() {
 }
 run_test 10d "Archive a file on the default archive id"
 
-test_11() {
+test_11a() {
        mkdir -p $DIR/$tdir
        copy2archive /etc/hosts $tdir/$tfile
        local f=$DIR/$tdir/$tfile
@@ -1007,7 +1018,31 @@ test_11() {
        local AFILE=$(do_facet $SINGLEAGT ls $HSM_ARCHIVE'/*/*/*/*/*/*/'$fid) ||
                error "fid $fid not in archive $HSM_ARCHIVE"
 }
-run_test 11 "Import a file"
+run_test 11a "Import a file"
+
+test_11b() {
+       # test needs a running copytool
+       copytool_setup
+
+       mkdir -p $DIR/$tdir
+       local f=$DIR/$tdir/$tfile
+       local fid=$(copy_file /etc/hosts $f)
+       $LFS hsm_archive -a $HSM_ARCHIVE_NUMBER $f ||
+               error "hsm_archive failed"
+       wait_request_state $fid ARCHIVE SUCCEED
+
+       local FILE_HASH=$(md5sum $f)
+       rm -f $f
+
+       import_file $fid $f
+
+       echo "$FILE_HASH" | md5sum -c
+
+       [[ $? -eq 0 ]] || error "Restored file differs"
+
+       copytool_cleanup
+}
+run_test 11b "Import a deleted file using its FID"
 
 test_12a() {
        # test needs a running copytool
@@ -3978,9 +4013,9 @@ test_402() {
        copytool_cleanup
 
        # deactivate all mdc on agent1
-       mdc_change_state $SINGLEAGT "MDT000." "deactivate"
+       mdc_change_state $SINGLEAGT "$FSNAME-MDT000." "deactivate"
 
-       copytool_setup $SINGLEAGT
+       HSMTOOL_NOERROR=true copytool_setup $SINGLEAGT
 
        check_agent_unregistered "uuid" # match any agent
 
@@ -3988,7 +4023,7 @@ test_402() {
        search_copytools $agent && error "Copytool start should have failed"
 
        # reactivate MDCs
-       mdc_change_state $SINGLEAGT "MDT000." "activate"
+       mdc_change_state $SINGLEAGT "$FSNAME-MDT000." "activate"
 }
 run_test 402 "Copytool start fails if all MDTs are inactive"
 
@@ -4002,7 +4037,7 @@ test_403() {
        local uuid=$(do_rpc_nodes $agent get_client_uuid | cut -d' ' -f2)
 
        # deactivate all mdc for MDT0001
-       mdc_change_state $SINGLEAGT "MDT0001" "deactivate"
+       mdc_change_state $SINGLEAGT "$FSNAME-MDT0001" "deactivate"
 
        copytool_setup
        # check the agent is registered on MDT0000, and not on MDT0001
@@ -4013,7 +4048,7 @@ test_403() {
        search_copytools $agent || error "No running copytools on $agent"
 
        # reactivate all mdc for MDT0001
-       mdc_change_state $SINGLEAGT "MDT0001" "activate"
+       mdc_change_state $SINGLEAGT "$FSNAME-MDT0001" "activate"
 
        # make sure the copytool is now registered to all MDTs
        check_agent_registered $uuid
@@ -4037,7 +4072,7 @@ test_404() {
        local fid1=$(make_small $dir_mdt0/$tfile)
 
        # deactivate all mdc for MDT0001
-       mdc_change_state $SINGLEAGT "MDT0001" "deactivate"
+       mdc_change_state $SINGLEAGT "$FSNAME-MDT0001" "deactivate"
 
        # send an HSM request for files in MDT0000
        $LFS hsm_archive $dir_mdt0/$tfile || error "lfs hsm_archive"
@@ -4047,7 +4082,7 @@ test_404() {
                echo "archive successful on mdt0"
 
        # reactivate all mdc for MDT0001
-       mdc_change_state $SINGLEAGT "MDT0001" "activate"
+       mdc_change_state $SINGLEAGT "$FSNAME-MDT0001" "activate"
 
        copytool_cleanup
        # clean test files and directories