From: Sage Weil <sage@inktank.com>
Date: Thu, 29 May 2014 18:10:18 +0000 (-0700)
Subject: osd: fix bad is_active() assert in share_map()
X-Git-Tag: v0.82~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1b890ecb3515bdd3e87ed67dd810e632013e42a;p=ceph.git

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 <sage@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1e20a780459..2a5285bcf2d 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);