From: Sage Weil <sage@redhat.com>
Date: Tue, 14 Oct 2014 19:42:40 +0000 (-0700)
Subject: Revert "Objecter: disable fast dispatch of CEPH_MSG_OSD_OPREPLY messages"
X-Git-Tag: v0.87.1~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3356%2Fhead;p=ceph.git

Revert "Objecter: disable fast dispatch of CEPH_MSG_OSD_OPREPLY messages"

This reverts commit 3f23709c474292f9239f77a6cce26309fc86ce29.

We have changed mark_down() behavior so that it no longer blocks on
fast dispatch.  This makes the objecter reply handler safe again.

Fixes: #9598
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c9f9e72e558521cb90f90538bc27f995f82d76c2)
---

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