From 1e120c88d85aceccfbaadb4474d8533256dbadb2 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Tue, 29 Dec 2015 17:16:33 +0800 Subject: [PATCH] osd: Avoid osd_recovery_sleep cause recovery-thread suicide. Signed-off-by: Jianpeng Ma --- src/osd/OSD.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 4a212d470ac8..2e97428dd0ce 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -7922,9 +7922,11 @@ bool OSD::_recover_now() void OSD::do_recovery(PG *pg, ThreadPool::TPHandle &handle) { if (g_conf->osd_recovery_sleep > 0) { + handle.suspend_tp_timeout(); utime_t t; t.set_from_double(g_conf->osd_recovery_sleep); t.sleep(); + handle.reset_tp_timeout(); dout(20) << __func__ << " slept for " << t << dendl; } -- 2.47.3