From: Greg Farnum <greg@inktank.com>
Date: Mon, 15 Sep 2014 21:11:37 +0000 (-0700)
Subject: Objecter: disable fast dispatch of CEPH_MSG_OSD_OPREPLY messages
X-Git-Tag: v0.86~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f23709c474292f9239f77a6cce26309fc86ce29;p=ceph.git

Objecter: disable fast dispatch of CEPH_MSG_OSD_OPREPLY messages

If they fast_dispatch they can deadlock right now. We'll need to change
the semantics around mark_down() or around the Objecter's locking to
fix it.

Sort-of-
Fixes: #9462

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 342dda5e3cc0..934375299855 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1653,12 +1653,14 @@ public:
  public:
   bool ms_dispatch(Message *m);
   bool ms_can_fast_dispatch_any() const {
-    return true;
+    return false;
   }
   bool ms_can_fast_dispatch(Message *m) const {
     switch (m->get_type()) {
     case CEPH_MSG_OSD_OPREPLY:
-      return true;
+      /* sadly, we need to solve a deadlock before reenabling.
+       * See tracker issue #9462 */
+      return false;
     default:
       return false;
     }