OSD: check for is_stopping after locking osd_lock or heartbeat_lock

Signed-off-by: Samuel Just <sam.just@inktank.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 0a5386acacd..d41c9fec4d6 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1099,6 +1099,10 @@ protected:
     }
     void _process(Command *c) {
       osd->osd_lock.Lock();
+      if (osd->is_stopping()) {
+	delete c;
+	return;
+      }
       osd->do_command(c->con, c->tid, c->cmd, c->indata);
       osd->osd_lock.Unlock();
       delete c;
@@ -1353,6 +1357,10 @@ protected:
     }
     void _process(MOSDRepScrub *msg) {
       osd->osd_lock.Lock();
+      if (osd->is_stopping()) {
+	osd->osd_lock.Unlock();
+	return;
+      }
       if (osd->_have_pg(msg->pgid)) {
 	PG *pg = osd->_lookup_lock_pg(msg->pgid);
 	osd->osd_lock.Unlock();