From f004def5b7cb8aa31e7f428f5be9bcf1aee2f30c Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Tue, 19 Sep 2023 14:26:19 +0300 Subject: [PATCH] osd: do not assert on fast shutdown timeout Fixes: https://tracker.ceph.com/issues/61140 Signed-off-by: Igor Fedotov --- src/osd/OSD.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index f01540c3a9307..d813de2b7e209 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -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; -- 2.39.5