From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/mds/SessionMap.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/mds/SessionMap.h') diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h index ddf227be9..360dd66a2 100644 --- a/src/mds/SessionMap.h +++ b/src/mds/SessionMap.h @@ -314,6 +314,7 @@ public: bool trim_completed_requests(ceph_tid_t mintid) { // trim bool erased_any = false; + last_trim_completed_requests_tid = mintid; while (!info.completed_requests.empty() && (mintid == 0 || info.completed_requests.begin()->first < mintid)) { info.completed_requests.erase(info.completed_requests.begin()); @@ -339,6 +340,7 @@ public: } bool trim_completed_flushes(ceph_tid_t mintid) { bool erased_any = false; + last_trim_completed_flushes_tid = mintid; while (!info.completed_flushes.empty() && (mintid == 0 || *info.completed_flushes.begin() < mintid)) { info.completed_flushes.erase(info.completed_flushes.begin()); @@ -493,6 +495,9 @@ private: unsigned num_trim_flushes_warnings = 0; unsigned num_trim_requests_warnings = 0; + + ceph_tid_t last_trim_completed_requests_tid = 0; + ceph_tid_t last_trim_completed_flushes_tid = 0; }; class SessionFilter -- cgit v1.2.3