From d8226b9353dbc1448af8d23c13cae5f21cbe3a86 Mon Sep 17 00:00:00 2001 From: Hongchao Zhang Date: Thu, 11 Jul 2019 04:20:33 -0400 Subject: [PATCH] LU-11768 test: limit at_max to timeout in time 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 Reviewed-on: https://review.whamcloud.com/35651 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Wang Shilong Reviewed-by: Oleg Drokin --- lustre/tests/sanity-quota.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 3ac7b51..c057769 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -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 -- 1.8.3.1