huynp911
/
vitastor
forked from vitalif/vitastor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove naggy RDMA messages when log level is zero

nbd-vmsplice
Vitaliy Filippov 2021-11-06 14:34:41 +03:00
parent 8e445ddc9a
commit 609bd4eb59
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/messenger.cpp
View File

@ -17,11 +17,12 @@ void osd_messenger_t::init()
{ {
rdma_context = msgr_rdma_context_t::create( rdma_context = msgr_rdma_context_t::create(
rdma_device != "" ? rdma_device.c_str() : NULL, rdma_device != "" ? rdma_device.c_str() : NULL,
rdma_port_num, rdma_gid_index, rdma_mtu rdma_port_num, rdma_gid_index, rdma_mtu, log_level
); );
if (!rdma_context) if (!rdma_context)
{ {
fprintf(stderr, "[OSD %lu] Couldn't initialize RDMA, proceeding with TCP only\n", osd_num); if (log_level > 0)
fprintf(stderr, "[OSD %lu] Couldn't initialize RDMA, proceeding with TCP only\n", osd_num);
} }
else else
{ {

5
src/msgr_rdma.cpp
View File

@ -51,7 +51,7 @@ msgr_rdma_connection_t::~msgr_rdma_connection_t()
free(b); free(b);
} }
msgr_rdma_context_t *msgr_rdma_context_t::create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu) msgr_rdma_context_t *msgr_rdma_context_t::create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu, int log_level)
{ {
int res; int res;
ibv_device **dev_list = NULL; ibv_device **dev_list = NULL;
@ -70,7 +70,8 @@ msgr_rdma_context_t *msgr_rdma_context_t::create(const char *ib_devname, uint8_t
ctx->dev = *dev_list; ctx->dev = *dev_list;
if (!ctx->dev) if (!ctx->dev)
{ {
fprintf(stderr, "No RDMA devices found\n"); if (log_level > 0)
fprintf(stderr, "No RDMA devices found\n");
goto cleanup; goto cleanup;
} }
} }

2
src/msgr_rdma.h
View File

@ -35,7 +35,7 @@ struct msgr_rdma_context_t
int max_cqe = 0; int max_cqe = 0;
int used_max_cqe = 0; int used_max_cqe = 0;
static msgr_rdma_context_t *create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu); static msgr_rdma_context_t *create(const char *ib_devname, uint8_t ib_port, uint8_t gid_index, uint32_t mtu, int log_level);
~msgr_rdma_context_t(); ~msgr_rdma_context_t();
}; };