]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd: do not assert on fast shutdown timeout
authorIgor Fedotov <igor.fedotov@croit.io>
Tue, 19 Sep 2023 11:26:19 +0000 (14:26 +0300)
committerIgor Fedotov <igor.fedotov@croit.io>
Tue, 3 Oct 2023 17:30:13 +0000 (20:30 +0300)
Fixes: https://tracker.ceph.com/issues/61140
Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
src/osd/OSD.cc

index f01540c3a930718acc815699f812e03da1458df8..d813de2b7e2094fcfe1336f3614795ab7a548aa5 100644 (file)
@@ -4496,10 +4496,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;