Skip to content

Commit

Permalink
libceph: reschedule tick in mon_fault()
Browse files Browse the repository at this point in the history
Doing __schedule_delayed() in the hunting branch is pointless, as the
tick will have already been scheduled by then.

What we need to do instead is *reschedule* it in the !hunting branch,
after reopen_session() changes hunt_mult, which affects the delay.
This helps with spacing out connection attempts and avoiding things
like two back-to-back attempts followed by a longer period of waiting
around.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
  • Loading branch information
Ilya Dryomov committed Mar 25, 2016
1 parent 1752b50 commit bee3a37
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/ceph/mon_client.c
Original file line number Diff line number Diff line change
@@ -222,8 +222,8 @@ static void __schedule_delayed(struct ceph_mon_client *monc)
delay = CEPH_MONC_PING_INTERVAL;

dout("__schedule_delayed after %lu\n", delay);
schedule_delayed_work(&monc->delayed_work,
round_jiffies_relative(delay));
mod_delayed_work(system_wq, &monc->delayed_work,
round_jiffies_relative(delay));
}

const char *ceph_sub_str[] = {
@@ -1166,9 +1166,9 @@ static void mon_fault(struct ceph_connection *con)
if (!monc->hunting) {
dout("%s hunting for new mon\n", __func__);
reopen_session(monc);
} else {
/* already hunting, let's wait a bit */
__schedule_delayed(monc);
} else {
dout("%s already hunting\n", __func__);
}
out:
mutex_unlock(&monc->mutex);

0 comments on commit bee3a37

Please sign in to comment.