From: Igor Fedotov <igor.fedotov@croit.io>
Date: Tue, 19 Sep 2023 11:26:19 +0000 (+0300)
Subject: osd: do not assert on fast shutdown timeout
X-Git-Tag: v18.2.5~477^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4f8799f5491eaf7e32c8da3a4e744a1e391f1b62;p=ceph.git

osd: do not assert on fast shutdown timeout

Fixes: https://tracker.ceph.com/issues/61140

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit f004def5b7cb8aa31e7f428f5be9bcf1aee2f30c)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c61e7d33218ab..3cf799b637307 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4491,10 +4491,12 @@ int OSD::shutdown()
     store->umount();
 
     utime_t end_time = ceph_clock_now();
-    if (cct->_conf->osd_fast_shutdown_timeout) {
-      ceph_assert(end_time - start_time_func < cct->_conf->osd_fast_shutdown_timeout);
-    }
     dout(0) <<"Fast Shutdown duration total     :" << end_time              - start_time_func       << " seconds" << dendl;
+    if (cct->_conf->osd_fast_shutdown_timeout &&
+        end_time - start_time_func > cct->_conf->osd_fast_shutdown_timeout) {
+      dout(0) << "Fast Shutdown duration exceeded :" << cct->_conf->osd_fast_shutdown_timeout       << " seconds"
+              << dendl;
+    }
     dout(0) <<"Fast Shutdown duration osd_drain :" << start_time_umount     - start_time_osd_drain  << " seconds" << dendl;
     dout(0) <<"Fast Shutdown duration umount    :" << end_time              - start_time_umount     << " seconds" << dendl;
     dout(0) <<"Fast Shutdown duration timer     :" << start_time_osd_drain  - start_time_timer      << " seconds" << dendl;