From: Haomai Wang <haomaiwang@gmail.com>
Date: Fri, 19 Sep 2014 10:11:21 +0000 (+0800)
Subject: Event: Fix do_request bug
X-Git-Tag: v0.88~37^2~4^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9c86a31a53f26b2e103109c86442db2f3f1fd35;p=ceph.git

Event: Fix do_request bug

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/msg/AsyncConnection.cc b/src/msg/AsyncConnection.cc
index 934740122ce4..a9fc8f2b6f81 100644
--- a/src/msg/AsyncConnection.cc
+++ b/src/msg/AsyncConnection.cc
@@ -498,6 +498,7 @@ void AsyncConnection::process()
             }
           }
 
+          throttle_stamp = ceph_clock_now(msgr->cct);
           state = STATE_OPEN_MESSAGE_READ_FRONT;
           break;
         }
diff --git a/src/msg/Event.cc b/src/msg/Event.cc
index 70781827c68d..c98021944afe 100644
--- a/src/msg/Event.cc
+++ b/src/msg/Event.cc
@@ -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);