diff --git a/src/brpc/rdma/rdma_helper.cpp b/src/brpc/rdma/rdma_helper.cpp index 9bad33750c..a639728680 100644 --- a/src/brpc/rdma/rdma_helper.cpp +++ b/src/brpc/rdma/rdma_helper.cpp @@ -501,7 +501,6 @@ static void GlobalRdmaInitializeOrDieImpl() { } else { LOG(INFO) << "RDMA GID Index: " << (int)g_gid_index; } - IbvCreateCompChannel(g_context); // Create protection domain g_pd = IbvAllocPd(g_context); diff --git a/src/brpc/socket.cpp b/src/brpc/socket.cpp index 78bd4e23d2..005873e9b0 100644 --- a/src/brpc/socket.cpp +++ b/src/brpc/socket.cpp @@ -2512,8 +2512,12 @@ void Socket::DebugSocket(std::ostream& os, SocketId id) { << "\n}"; } #endif + + os << "\nrdma={\n"; ptr->_transport->Debug(os); - { os << "\nbthread_tag=" << ptr->_io_event.bthread_tag(); } + os << "}\n"; + + os << "\nbthread_tag=" << ptr->_io_event.bthread_tag(); } int Socket::CheckHealth() { diff --git a/test/bvar_recorder_unittest.cpp b/test/bvar_recorder_unittest.cpp index 7493c34541..a385b9b7bd 100644 --- a/test/bvar_recorder_unittest.cpp +++ b/test/bvar_recorder_unittest.cpp @@ -244,15 +244,15 @@ TEST(RecorderTest, latency_recorder_qps_accuracy) { double err = fabs(qps_sum / 1000.0 - exp_qps); return err; }; - ASSERT_GT(0.2, read(lr1, 10/2.0)); - ASSERT_GT(0.2, read(lr2, 11/2.0)); - ASSERT_GT(0.2, read(lr3, 3/2.0)); - ASSERT_GT(0.2, read(lr4, 1/2.0)); + ASSERT_GT(0.1, read(lr1, 10/2.0)); + ASSERT_GT(0.1, read(lr2, 11/2.0)); + ASSERT_GT(0.1, read(lr3, 3/2.0)); + ASSERT_GT(0.1, read(lr4, 1/2.0)); - ASSERT_GT(0.2, read(lr1, 10/3.0, 3)); - ASSERT_GT(0.2, read(lr2, 11/3.0, 3)); - ASSERT_GT(0.2, read(lr3, 3/3.0, 3)); - ASSERT_GT(0.2, read(lr4, 1/3.0, 3)); + ASSERT_GT(0.1, read(lr1, 10/3.0, 3)); + ASSERT_GT(0.1, read(lr2, 11/3.0, 3)); + ASSERT_GT(0.1, read(lr3, 3/3.0, 3)); + ASSERT_GT(0.1, read(lr4, 1/3.0, 3)); } } // namespace