RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 07:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

xio: Add xio_transport_type

Browse Source 
Add xio_transport_type to control and run xio messenger over
rdma or tcp

Signed-off-by: Vu Pham <vu@mellanox.com>
This commit is contained in:
Vu Pham 2015-03-17 05:17:01 -07:00
parent 8b8a6f167c
commit 9f3f9efa1e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/config_opts.h
View File

@ -74,6 +74,7 @@ OPTION(xio_mp_max_1k, OPT_INT, 8192) // max 1K chunks
OPTION(xio_mp_max_page, OPT_INT, 4096) // max 1K chunks
OPTION(xio_mp_max_hint, OPT_INT, 4096) // max size-hint chunks
OPTION(xio_portal_threads, OPT_INT, 2) // xio portal threads per messenger
OPTION(xio_transport_type, OPT_STR, "rdma") // xio transport type: {rdma or tcp}
DEFAULT_SUBSYS(0, 5)
SUBSYS(lockdep, 0, 1)

16
src/msg/xio/XioMessenger.cc
View File

@ -212,10 +212,12 @@ static int on_cancel_request(struct xio_session *session,
}
/* free functions */
static string xio_uri_from_entity(const entity_addr_t& addr, bool want_port)
static string xio_uri_from_entity(const string &type,
const entity_addr_t& addr, bool want_port)
{
const char *host = NULL;
char addr_buf[129];
string xio_uri;
switch(addr.addr.ss_family) {
case AF_INET:
@ -231,8 +233,12 @@ static string xio_uri_from_entity(const entity_addr_t& addr, bool want_port)
break;
};
if (type == "rdma" || type == "tcp")
xio_uri = type + "://";
else
xio_uri = "rdma://";
/* The following can only succeed if the host is rdma-capable */
string xio_uri = "rdma://";
xio_uri += host;
if (want_port) {
xio_uri += ":";
@ -669,7 +675,8 @@ int XioMessenger::bind(const entity_addr_t& addr)
entity_addr_t shift_addr = *a;
string base_uri = xio_uri_from_entity(shift_addr, false /* want_port */);
string base_uri = xio_uri_from_entity(cct->_conf->xio_transport_type,
shift_addr, false /* want_port */);
ldout(cct,4) << "XioMessenger " << this << " bind: xio_uri "
<< base_uri << ':' << shift_addr.get_port() << dendl;
@ -915,7 +922,8 @@ ConnectionRef XioMessenger::get_connection(const entity_inst_t& dest)
}
else {
conns_sp.unlock();
string xio_uri = xio_uri_from_entity(dest.addr, true /* want_port */);
string xio_uri = xio_uri_from_entity(cct->_conf->xio_transport_type,
dest.addr, true /* want_port */);
ldout(cct,4) << "XioMessenger " << this << " get_connection: xio_uri "
<< xio_uri << dendl;