Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/brpc/rdma/rdma_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 5 additions & 1 deletion src/brpc/socket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
16 changes: 8 additions & 8 deletions test/bvar_recorder_unittest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading