From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 30 Jul 2025 10:13:06 +0000 (+0200)
Subject: monc: synchronize tick() of MonClient with shutdown()
X-Git-Tag: v19.2.4~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8a8a5663842bbcbf343219733c4c8b2da29225b;p=ceph.git

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)
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index acda4f6d391..6cb43c00a97 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] {