RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7949 from wjin/fix

Browse Source 
Event: fix clock skew problem

Reviewed-by: Haomai Wang <haomai@xsky.com>
This commit is contained in:
Haomai Wang 2016-03-13 12:15:53 +08:00
commit 497cde4067
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/msg/async/Event.cc
View File

@ -303,13 +303,9 @@ int EventCenter::process_time_events()
* events to be processed ASAP when this happens: the idea is that
* processing events earlier is less dangerous than delaying them
* indefinitely, and practice suggests it is. */
bool clock_skewed = false;
if (now < last_time) {
map<utime_t, list<TimeEvent> > changed;
for (map<utime_t, list<TimeEvent> >::iterator it = time_events.begin();
it != time_events.end(); ++it) {
changed[utime_t()].swap(it->second);
}
time_events.swap(changed);
clock_skewed = true;
}
last_time = now;
@ -318,7 +314,7 @@ int EventCenter::process_time_events()
for (map<utime_t, list<TimeEvent> >::iterator it = time_events.begin();
it != time_events.end(); ) {
prev = it;
if (cur >= it->first) {
if (cur >= it->first || clock_skewed) {
need_process.splice(need_process.end(), it->second);
++it;
time_events.erase(prev);