From f0143bb942c531ac89d8c49f2db012eb6ef06fc5 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 18 Mar 2016 14:30:23 -0700 Subject: [PATCH] OSD: bail out of _committed_osd_maps if we are shutting down Introduced in b839a06c1aba24ecf0780387a605192ff929f158 Fixes: 14309 Signed-off-by: Samuel Just --- src/osd/OSD.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 57242a48b46f..298d65df454f 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -6756,6 +6756,10 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m) { dout(10) << __func__ << " " << first << ".." << last << dendl; Mutex::Locker l(osd_lock); + if (is_stopping()) { + dout(10) << __func__ << " bailing, we are shutting down" << dendl; + return; + } map_lock.get_write(); bool do_shutdown = false; -- 2.47.3