From 76eab177a13e9d1ea14b512100e410e86a70cdd3 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 30 Jul 2024 16:40:06 -0400 Subject: [PATCH] mds: add mds_lock asserts for journal flush Signed-off-by: Patrick Donnelly --- src/mds/MDSRank.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 9cf2e89791c05..ec06c8bf45174 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -71,7 +71,7 @@ public: } void send() { - ceph_assert(ceph_mutex_is_locked(mds->mds_lock)); + ceph_assert(ceph_mutex_is_locked_by_me(mds->mds_lock)); dout(20) << __func__ << dendl; @@ -112,6 +112,7 @@ private: } void handle_clear_mdlog(int r) { + ceph_assert(ceph_mutex_is_locked_by_me(mds->mds_lock)); dout(20) << __func__ << ": r=" << r << dendl; if (r != 0) { @@ -181,6 +182,7 @@ private: } void trim_expired_segments() { + ceph_assert(ceph_mutex_is_locked_by_me(mds->mds_lock)); dout(5) << __func__ << ": expiry complete, expire_pos/trim_pos is now " << std::hex << mdlog->get_journaler()->get_expire_pos() << "/" << mdlog->get_journaler()->get_trimmed_pos() << dendl; @@ -218,6 +220,7 @@ private: } void finish(int r) override { + ceph_assert(!ceph_mutex_is_locked_by_me(mds->mds_lock)); dout(20) << __func__ << ": r=" << r << dendl; on_finish->complete(r); } -- 2.39.5