From 49730821c4e5116f188c931830ce23b2da2d8a41 Mon Sep 17 00:00:00 2001 From: Hongchao Zhang Date: Wed, 20 Mar 2024 13:37:22 +0800 Subject: [PATCH] LU-16736 quota: set revoke time to avoid endless wait The revoke time of the lquota entry should be set when its qunit reaches least qunit, but it could not be set in some rare case, which could be related to the broken quota LDLM lock, set it in "qmt_acquire" to avoid endless wait in QSD. Signed-off-by: Hongchao Zhang Change-Id: Ib68c5dc881346e0e619d43553ee490847ae5e225 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50626 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Reviewed-by: Sergey Cheremencev Reviewed-by: Andreas Dilger --- lustre/quota/qmt_entry.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lustre/quota/qmt_entry.c b/lustre/quota/qmt_entry.c index 5a55034..31cfd91 100644 --- a/lustre/quota/qmt_entry.c +++ b/lustre/quota/qmt_entry.c @@ -561,8 +561,17 @@ bool qmt_adjust_edquot(struct lquota_entry *lqe, __u64 now) RETURN(false); /* least qunit value not sent to all slaves yet */ - if (lqe->lqe_revoke_time == 0) + if (lqe->lqe_revoke_time == 0 && + !lqe->lqe_gl && list_empty(&lqe->lqe_link)) { + /* LU-16736: the revoke_time should be set when + * the qunit reachs the least qunit, the quota + * LDLM lock could encounter some issue, setting + * it to avoid endless wait in QSD. */ + LQUOTA_ERROR(lqe, "set revoke_time explicitly"); + + lqe->lqe_revoke_time = ktime_get_seconds(); RETURN(false); + } /* Let's give more time to slave to release space */ lapse = ktime_get_seconds() - QMT_REBA_TIMEOUT; -- 1.8.3.1