From 609bd4eb591254178c943a2ddba6a4e46e585d5c Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 6 Nov 2021 14:34:41 +0300 Subject: [PATCH] Remove naggy RDMA messages when log level is zero --- src/messenger.cpp | 5 +++-- src/msgr_rdma.cpp | 5 +++-- src/msgr_rdma.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/messenger.cpp b/src/messenger.cpp index 1a0b79266..dad170f40 100644 --- a/src/messenger.cpp +++ b/src/messenger.cpp @@ -17,11 +17,12 @@ void osd_messenger_t::init() { rdma_context = msgr_rdma_context_t::create( 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) { - 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 { diff --git a/src/msgr_rdma.cpp b/src/msgr_rdma.cpp index 9f286ea50..f5e5c1176 100644 --- a/src/msgr_rdma.cpp +++ b/src/msgr_rdma.cpp @@ -51,7 +51,7 @@ msgr_rdma_connection_t::~msgr_rdma_connection_t() 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; 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; if (!ctx->dev) { - fprintf(stderr, "No RDMA devices found\n"); + if (log_level > 0) + fprintf(stderr, "No RDMA devices found\n"); goto cleanup; } } diff --git a/src/msgr_rdma.h b/src/msgr_rdma.h index 4f2577078..0789a02dd 100644 --- a/src/msgr_rdma.h +++ b/src/msgr_rdma.h @@ -35,7 +35,7 @@ struct msgr_rdma_context_t int 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(); };