Skip to content

Commit 65d87c6

Browse files
author
CKI KWF Bot
committed
Merge: dlm: move to rinfo for all middle conversion cases
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7259 JIRA: https://issues.redhat.com/browse/RHEL-110034 Since commit f74dacb ("dlm: fix recovery of middle conversions") we introduced additional debugging information if we hit the middle conversion by using log_limit(). The DLM log_limit() functionality requires a DLM debug option being enabled. As this case is so rarely and excempt any potential introduced new issue with recovery we switching it to log_rinfo() ad this is ratelimited under normal DLM loglevel. Signed-off-by: Alexander Aring <aahringo@redhat.com> Signed-off-by: David Teigland <teigland@redhat.com> (cherry picked from commit a8abcff) Approved-by: David Teigland <teigland@redhat.com> Approved-by: Andrew Price <anprice@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 7dffc1b + 69d26cb commit 65d87c6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/dlm/lock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5649,7 +5649,7 @@ static int receive_rcom_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,
56495649

56505650
if (rl->rl_status == DLM_LKSTS_CONVERT && middle_conversion(lkb)) {
56515651
/* We may need to adjust grmode depending on other granted locks. */
5652-
log_limit(ls, "%s %x middle convert gr %d rq %d remote %d %x",
5652+
log_rinfo(ls, "%s %x middle convert gr %d rq %d remote %d %x",
56535653
__func__, lkb->lkb_id, lkb->lkb_grmode,
56545654
lkb->lkb_rqmode, lkb->lkb_nodeid, lkb->lkb_remid);
56555655
rsb_set_flag(r, RSB_RECOVER_CONVERT);

fs/dlm/recover.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ static void recover_conversion(struct dlm_rsb *r)
844844
*/
845845
if (((lkb->lkb_grmode == DLM_LOCK_PR) && (other_grmode == DLM_LOCK_CW)) ||
846846
((lkb->lkb_grmode == DLM_LOCK_CW) && (other_grmode == DLM_LOCK_PR))) {
847-
log_limit(ls, "%s %x gr %d rq %d, remote %d %x, other_lkid %u, other gr %d, set gr=NL",
847+
log_rinfo(ls, "%s %x gr %d rq %d, remote %d %x, other_lkid %u, other gr %d, set gr=NL",
848848
__func__, lkb->lkb_id, lkb->lkb_grmode,
849849
lkb->lkb_rqmode, lkb->lkb_nodeid,
850850
lkb->lkb_remid, other_lkid, other_grmode);

0 commit comments

Comments
 (0)