]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Event: Fix do_request bug
authorHaomai Wang <haomaiwang@gmail.com>
Fri, 19 Sep 2014 10:11:21 +0000 (18:11 +0800)
committerHaomai Wang <haomaiwang@gmail.com>
Wed, 8 Oct 2014 06:04:59 +0000 (14:04 +0800)
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
src/msg/AsyncConnection.cc
src/msg/Event.cc

index 934740122ce4305769880fbaaf8c57f782963979..a9fc8f2b6f81fb7338daca167b3799077de78237 100644 (file)
@@ -498,6 +498,7 @@ void AsyncConnection::process()
             }
           }
 
+          throttle_stamp = ceph_clock_now(msgr->cct);
           state = STATE_OPEN_MESSAGE_READ_FRONT;
           break;
         }
index 70781827c68d0fa2a570499760f6314135425513..c98021944afeceacf2f0da1124d4a6f5f8537b14 100644 (file)
@@ -218,7 +218,7 @@ int EventCenter::process_time_events()
     if (cur >= it->first) {
       ldout(cct, 10) << __func__ << " queue time event: id=" << it->second << " time is "
                      << it->first << dendl;
-      time_events[it->second].time_cb->do_request(it->first);
+      time_events[it->second].time_cb->do_request(it->second);
       processed++;
       ++it;
       time_to_ids.erase(prev);