From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Aug 2014 00:43:10 +0000 (-0700)
Subject: osd: fix osd_tp shutdown
X-Git-Tag: v0.86~189^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2335%2Fhead;p=ceph.git

osd: fix osd_tp shutdown

We need to clear the queue, not just drain the currently executing jobs.

Fixes: #9218
Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 9b4507ac937..d92cd1182ff 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2413,8 +2413,10 @@ int OSD::shutdown()
   dout(10) << "recovery tp stopped" << dendl;
 
   osd_tp.drain();
+  peering_wq.clear();
+  scrub_finalize_wq.clear();
   osd_tp.stop();
-  dout(10) << "op tp stopped" << dendl;
+  dout(10) << "osd tp stopped" << dendl;
 
   osd_op_tp.drain();
   osd_op_tp.stop();
@@ -2461,7 +2463,7 @@ int OSD::shutdown()
     Mutex::Locker l(pg_stat_queue_lock);
     assert(pg_stat_queue.empty());
   }
-  peering_wq.clear();
+
   // Remove PGs
 #ifdef PG_DEBUG_REFS
   service.dump_live_pgids();