]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD: bail out of _committed_osd_maps if we are shutting down 8267/head
authorSamuel Just <sjust@redhat.com>
Fri, 18 Mar 2016 21:30:23 +0000 (14:30 -0700)
committerSamuel Just <sjust@redhat.com>
Fri, 18 Mar 2016 21:30:38 +0000 (14:30 -0700)
Introduced in b839a06c1aba24ecf0780387a605192ff929f158
Fixes: 14309
Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/OSD.cc

index 57242a48b46f8476fa5d539a8c2945e0fc74105a..298d65df454f192cc6881f72d06bd279dfb019cb 100644 (file)
@@ -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;