From: linbing <hawkerous@gmail.com>
Date: Tue, 19 Feb 2019 09:28:54 +0000 (+0800)
Subject: osd: fixup OpTracker destruct assert, waiting_for_osdmap take ref
X-Git-Tag: v13.2.6~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=155466f7edb5c0f4df5e72a3cdac710fd358a180;p=ceph.git

osd: fixup OpTracker destruct assert, waiting_for_osdmap take ref
     with OpRequest

Fixes: http://tracker.ceph.com/issues/38377
Signed-off-by: linbing <linbing@t2cloud.net>
(cherry picked from commit a6c1366d9a480ce66ada42a85a49b43e233206d0)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c2f69e5f28be..4f37077a1cd2 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3306,6 +3306,7 @@ int OSD::shutdown()
   op_shardedwq.drain();
   {
     finished.clear(); // zap waiters (bleh, this is messy)
+    waiting_for_osdmap.clear();
   }
 
   // unregister commands