From fc7c513b4cbcc8775076f6490f2df03b52cf4051 Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Sat, 3 Dec 2016 10:18:35 +0800 Subject: [PATCH] LU-9306 tests: more debug info for hsm test_24d More debug information for sanity-hsm test_24d. Drop unnecessary condition check for mdt_hsm_cdt_stop(). Test-Parameters: testlist=sanity-hsm,sanity-hsm,sanity-hsm,sanity-hsm Signed-off-by: Fan Yong Change-Id: Ib4a43693d364e208468937d15e3c48a1b1afb17a Reviewed-on: https://review.whamcloud.com/26770 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Niu Yawei Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/mdt/mdt_coordinator.c | 3 --- lustre/tests/sanity-hsm.sh | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c index 445bf7d..10da26b 100644 --- a/lustre/mdt/mdt_coordinator.c +++ b/lustre/mdt/mdt_coordinator.c @@ -919,9 +919,6 @@ int mdt_hsm_cdt_stop(struct mdt_device *mdt) struct mdt_thread_info *cdt_mti; ENTRY; - if (mdt->mdt_opts.mo_coordinator == 0) - RETURN(0); - if (cdt->cdt_state == CDT_STOPPED) { CERROR("%s: Coordinator already stopped\n", mdt_obd_name(mdt)); diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh index ca1f23e..359f781 100755 --- a/lustre/tests/sanity-hsm.sh +++ b/lustre/tests/sanity-hsm.sh @@ -2177,6 +2177,9 @@ test_24d() { rm -f $file1 fid1=$(make_small $file1) + echo $fid1 + $LFS getstripe $file1 + trap cleanup_test_24d EXIT zconf_mount $(facet_host $SINGLEAGT) "$MOUNT3" || error "cannot mount '$MOUNT3' on '$SINGLEAGT'" @@ -2185,6 +2188,9 @@ test_24d() { mount -o remount,ro $MOUNT2 + do_nodes $(comma_list $(nodes_list)) $LCTL clear + start_full_debug_logging + fid2=$(path2fid $file2) [ "$fid1" == "$fid2" ] || error "FID mismatch '$fid1' != '$fid2'" @@ -2193,9 +2199,11 @@ test_24d() { error "archive should fail on read-only mount" check_hsm_flags $file1 "0x00000000" - $LFS hsm_archive $file1 + $LFS hsm_archive $file1 || error "Fail to archive $file1" wait_request_state $fid1 ARCHIVE SUCCEED + stop_full_debug_logging + $LFS hsm_release $file1 $LFS hsm_restore $file2 wait_request_state $fid1 RESTORE SUCCEED -- 1.8.3.1