From: Sage Weil <sage@redhat.com>
Date: Thu, 18 Dec 2014 22:05:16 +0000 (-0800)
Subject: Merge pull request #3101 from yuyuyu101/wip-10147
X-Git-Tag: v0.91~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3f370f2463538d3925440e402d220b2469438c5;p=ceph.git

Merge pull request #3101 from yuyuyu101/wip-10147

Messenger Unit Tests

Reviewed-by: Sage Weil <sage@redhat.com>
---

e3f370f2463538d3925440e402d220b2469438c5
diff --cc src/tools/cephfs/MDSUtility.cc
index 53fb4912548fc,9bace76fa83ab..54985adf14e79
--- a/src/tools/cephfs/MDSUtility.cc
+++ b/src/tools/cephfs/MDSUtility.cc
@@@ -26,9 -26,9 +26,9 @@@ MDSUtility::MDSUtility() 
    waiting_for_mds_map(NULL)
  {
    monc = new MonClient(g_ceph_context);
-   messenger = Messenger::create(g_ceph_context, entity_name_t::CLIENT(), "mds", getpid());
+   messenger = Messenger::create(g_ceph_context, g_ceph_context->_conf->ms_type, entity_name_t::CLIENT(), "mds", getpid());
    mdsmap = new MDSMap();
 -  objecter = new Objecter(g_ceph_context, messenger, monc, 0, 0);
 +  objecter = new Objecter(g_ceph_context, messenger, monc, NULL, 0, 0);
  }