]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3101 from yuyuyu101/wip-10147
authorSage Weil <sage@redhat.com>
Thu, 18 Dec 2014 22:05:16 +0000 (14:05 -0800)
committerSage Weil <sage@redhat.com>
Thu, 18 Dec 2014 22:05:16 +0000 (14:05 -0800)
Messenger Unit Tests

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/ceph_osd.cc
src/librados/RadosClient.cc
src/test/Makefile.am
src/test/mon/test_mon_workloadgen.cc
src/tools/cephfs/MDSUtility.cc

diff --cc src/ceph_osd.cc
Simple merge
Simple merge
Simple merge
Simple merge
index 53fb4912548fc373b62be7dd66aa98e85f370aa8,9bace76fa83ab11c4a0cf9902450507e9e768054..54985adf14e79c3eb543e765e4a0a29e1dc9cbff
@@@ -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);
  }