Skip to content

Commit

Permalink
Merge pull request #4042 from dachary/wip-10546-giant
Browse files Browse the repository at this point in the history
ceph time check start round bug in monitor.cc
  • Loading branch information
liewegas committed Mar 17, 2015
2 parents 9fee7ba + fe7d4ca commit 1f58a0a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/mon/Monitor.cc
Expand Up @@ -3463,7 +3463,7 @@ void Monitor::timecheck_start_round()
dout(10) << __func__ << " there's a timecheck going on" << dendl;
utime_t curr_time = ceph_clock_now(g_ceph_context);
double max = g_conf->mon_timecheck_interval*3;
if (curr_time - timecheck_round_start > max) {
if (curr_time - timecheck_round_start < max) {
dout(10) << __func__ << " keep current round going" << dendl;
goto out;
} else {
Expand Down

0 comments on commit 1f58a0a

Please sign in to comment.