LU-14399 hsm: process hsm_actions in coordinator

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index a95399f..7a9a105 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2100,11 +2100,10 @@ t32_test() {
                shall_cleanup_lustre=true
                $r $LCTL set_param debug="$PTLDEBUG"
 
-               # Leave re-enabling this to a separate patch for LU-11558
-               # t32_verify_quota $SINGLEMDS $fsname $tmp/mnt/lustre || {
-               #       error_noexit "verify quota failed"
-               #       return 1
-               #}
+               t32_verify_quota $SINGLEMDS $fsname $tmp/mnt/lustre || {
+                       error_noexit "verify quota failed"
+                       return 1
+               }
 
                if $r test -f $tmp/list; then
                        #
@@ -8749,6 +8748,7 @@ test_122b() {
                        error "unlinkmany failed unlink $files files"
        done
        sync
+       touch $DIR/$tdir/$tfile
        do_facet ost1 sync
        #we need a write req during recovery for ofd_seq_load
        replay_barrier ost1
@@ -9397,6 +9397,28 @@ test_131() {
 }
 run_test 131 "MDT backup restore with project ID"
 
+test_132() {
+       local err_cnt
+       local err_cnt2
+
+       reformat
+       combined_mgs_mds || start_mgs || error "unable to start MGS"
+       start_mdt 1 || error "unable to start mdt1"
+
+       err_cnt=$(do_facet mds1 dmesg | grep -c "cannot take the layout locks")
+       stop_mdt 1 || error "stop mdt1 failed"
+
+       [ "$mds1_FSTYPE" == zfs ] && import_zpool mds1
+       do_facet mds1 $TUNEFS --param mdt.hsm_control=enabled $(mdsdevname 1) ||
+               error "tunefs failed"
+       start_mdt 1 || error "cannot start mdt1"
+
+       err_cnt2=$(do_facet mds1 dmesg | grep -c "cannot take the layout locks")
+       [ $err_cnt -eq $err_cnt2 ] || error "Can not take the layout lock"
+       stop_mdt 1 || error "stop mdt1 failed"
+}
+run_test 132 "hsm_actions processed after failover"
+
 if ! combined_mgs_mds ; then
        stop mgs
 fi