RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12711 from yuyuyu101/wip-fix-rdma

Browse Source 
msg/async/rdma: fix ceph_clock_now calls

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-12-29 14:35:57 -06:00 committed by GitHub
commit 9088f47ee4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/msg/async/rdma/RDMAStack.cc
View File

@ -252,7 +252,7 @@ void RDMADispatcher::polling()
RDMAWorker* worker;
ldout(cct, 20) << __func__ << " going to poll rx cq:" << rx_cq << dendl;
RDMAConnectedSocketImpl *conn = nullptr;
utime_t last_inactive = ceph_clock_now(cct);
utime_t last_inactive = ceph_clock_now();
bool rearmed = false;
while (true) {
@ -275,7 +275,7 @@ void RDMADispatcher::polling()
if (done)
break;
if ((ceph_clock_now(cct) - last_inactive).to_nsec() / 1000 > cct->_conf->ms_async_rdma_polling_us) {
if ((ceph_clock_now() - last_inactive).to_nsec() / 1000 > cct->_conf->ms_async_rdma_polling_us) {
if (!rearmed) {
// Clean up cq events after rearm notify ensure no new incoming event
// arrived between polling and rearm
@ -299,7 +299,7 @@ void RDMADispatcher::polling()
}
if (r > 0 && rx_cc->get_cq_event())
ldout(cct, 20) << __func__ << " got cq event." << dendl;
last_inactive = ceph_clock_now(cct);
last_inactive = ceph_clock_now();
rearmed = false;
}
continue;