Whamcloud - gitweb
LU-11768 test: limit at_max to timeout in time 51/35651/2
authorHongchao Zhang <hongchao@whamcloud.com>
Thu, 11 Jul 2019 08:20:33 +0000 (04:20 -0400)
committerOleg Drokin <green@whamcloud.com>
Tue, 27 Aug 2019 02:21:45 +0000 (02:21 +0000)
In test_6 of sanity-quota, if the AT is enabled, the timeout of
the QUOTA_DQACQ request could be longer than OBD_TIMEOUT*2, which
cause the watchdog to be triggered.

Change-Id: I7e3a976a004259f5c956fc48f4d8d63c751ee2c0
Signed-off-by: Hongchao Zhang <hongchao@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/35651
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/tests/sanity-quota.sh

index 3ac7b51..c057769 100755 (executable)
@@ -1141,6 +1141,11 @@ test_6() {
        #define OBD_FAIL_PTLRPC_DROP_REQ_OPC 0x513
        lustre_fail mds 0x513 601
 
+       if at_is_enabled; then
+               at_max_saved=$(at_max_get ost1)
+               at_max_set $TIMEOUT ost1
+       fi
+
        do_facet ost1 $LCTL set_param \
                        osd-*.$FSNAME-OST*.quota_slave.timeout=$((TIMEOUT / 2))
 
@@ -1157,6 +1162,8 @@ test_6() {
        echo "Sleep for $((TIMEOUT * 2 + 1)) seconds ..."
        sleep $((TIMEOUT * 2 + 1))
 
+       [ $at_max_saved -ne 0 ] && at_max_set $at_max_saved ost1
+
        # write should be blocked and never finished
        if ! ps -p $DDPID  > /dev/null 2>&1; then
                lustre_fail mds 0 0