]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: fix bad is_active() assert in share_map() 1882/head
authorSage Weil <sage@inktank.com>
Thu, 29 May 2014 18:10:18 +0000 (11:10 -0700)
committerSage Weil <sage@inktank.com>
Thu, 29 May 2014 18:10:18 +0000 (11:10 -0700)
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>
src/osd/OSD.cc

index 1e20a7804594c143d77ecab277383872357ee734..2a5285bcf2db69a2e4e575bcbad0a259ba88a03f 100644 (file)
@@ -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);