From f1b890ecb3515bdd3e87ed67dd810e632013e42a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 29 May 2014 11:10:18 -0700 Subject: [PATCH] osd: fix bad is_active() assert in share_map() We may be is_stopping() here if we are racing with shutdown(). Fixes: #8465 Backport: firefly, dumpling Signed-off-by: Sage Weil --- src/osd/OSD.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 1e20a7804594..2a5285bcf2db 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4770,7 +4770,8 @@ void OSDService::share_map( << name << " " << con->get_peer_addr() << " " << epoch << dendl; - assert(osd->is_active()); + assert(osd->is_active() || + osd->is_stopping()); bool want_shared = should_share_map(name, con, epoch, osdmap, sent_epoch_p); -- 2.47.3