From: Samuel Just <sjust@redhat.com>
Date: Fri, 18 Mar 2016 21:30:23 +0000 (-0700)
Subject: OSD: bail out of _committed_osd_maps if we are shutting down
X-Git-Tag: v10.1.1~141^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0143bb942c531ac89d8c49f2db012eb6ef06fc5;p=ceph.git

OSD: bail out of _committed_osd_maps if we are shutting down

Introduced in b839a06c1aba24ecf0780387a605192ff929f158
Fixes: 14309
Signed-off-by: Samuel Just <sjust@redhat.com>
---

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;