From f8a8a5663842bbcbf343219733c4c8b2da29225b Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 30 Jul 2025 12:13:06 +0200
Subject: [PATCH] monc: synchronize tick() of MonClient with shutdown()

For RCA please refer to: https://tracker.ceph.com/issues/67244#note-11.

Fixes: https://tracker.ceph.com/issues/67244
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 4d65098c874e8548711da9d04b274e8ef0e88922)
---
 src/mon/MonClient.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index acda4f6d3914..6cb43c00a979 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -963,6 +963,11 @@ void MonClient::tick()
 {
   ldout(cct, 10) << __func__ << dendl;
 
+  if (stopping) {
+    ldout(cct, 1) << "skipping tick on shutdown" << dendl;
+    return;
+  }
+
   utime_t now = ceph_clock_now();
 
   auto reschedule_tick = make_scope_guard([this] {
-- 
2.47.3