From: John Spray <john.spray@redhat.com>
Date: Fri, 19 Sep 2014 18:34:17 +0000 (+0100)
Subject: osdc/Objecter: don't consume non-osd cmd replies
X-Git-Tag: v0.88~97^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9c0ce4f4ac2b738b97ed88b5d8c69bbfc1e0efe;p=ceph.git

osdc/Objecter: don't consume non-osd cmd replies

...so that Client can get command replies from MDSs.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index ee4c49091a66..a2e03bbd96f1 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -581,8 +581,12 @@ bool Objecter::ms_dispatch(Message *m)
     return true;
 
   case MSG_COMMAND_REPLY:
-    handle_command_reply(static_cast<MCommandReply*>(m));
-    return true;
+    if (m->get_source().type() == CEPH_ENTITY_TYPE_OSD) {
+      handle_command_reply(static_cast<MCommandReply*>(m));
+      return true;
+    } else {
+      return false;
+    }
 
   case MSG_GETPOOLSTATSREPLY:
     handle_get_pool_stats_reply(static_cast<MGetPoolStatsReply*>(m));