From: John Spray <john.spray@redhat.com>
Date: Thu, 28 Aug 2014 23:53:44 +0000 (+0100)
Subject: client: fix dispatcher ordering (broken fuse)
X-Git-Tag: v0.86~179^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2351%2Fhead;p=ceph.git

client: fix dispatcher ordering (broken fuse)

Objecter never saw any OSD maps because of 1e1ee480 and
the dispatchers being in the wrong order -- ignoring map
in Client was hiding it from Objecter.

Fixes: #9266

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 58aa9ce4a81..a9cc8d8c88c 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -354,8 +354,8 @@ int Client::init()
   objecter->init();
 
   // ok!
-  messenger->add_dispatcher_head(objecter);
-  messenger->add_dispatcher_head(this);
+  messenger->add_dispatcher_tail(objecter);
+  messenger->add_dispatcher_tail(this);
 
   int r = monclient->init();
   if (r < 0) {
@@ -370,7 +370,6 @@ int Client::init()
 
   monclient->set_want_keys(CEPH_ENTITY_TYPE_MDS | CEPH_ENTITY_TYPE_OSD);
   monclient->sub_want("mdsmap", 0, 0);
-  monclient->sub_want("osdmap", 0, CEPH_SUBSCRIBE_ONETIME);
   monclient->renew_subs();
 
   // logger