summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2018-04-23 15:25:10 +0200
committerIlya Dryomov <idryomov@gmail.com>2018-04-24 10:40:21 +0200
commit7b4c443d139f1d2b5570da475f7a9cbcef86740c (patch)
treea1f038796fd00837442c9d6b34264efe70db3210
parentfacb9f6eba3df4e8027301cc0e514dc582a1b366 (diff)
downloadlinux-stable-7b4c443d139f1d2b5570da475f7a9cbcef86740c.tar.gz
linux-stable-7b4c443d139f1d2b5570da475f7a9cbcef86740c.tar.bz2
linux-stable-7b4c443d139f1d2b5570da475f7a9cbcef86740c.zip
libceph: reschedule a tick in finish_hunting()
If we go without an established session for a while, backoff delay will climb to 30 seconds. The keepalive timeout is also 30 seconds, so it's pretty easily hit after a prolonged hunting for a monitor: we don't get a chance to send out a keepalive in time, which means we never get back a keepalive ack in time, cutting an established session and attempting to connect to a different monitor every 30 seconds: [Sun Apr 1 23:37:05 2018] libceph: mon0 10.80.20.99:6789 session established [Sun Apr 1 23:37:36 2018] libceph: mon0 10.80.20.99:6789 session lost, hunting for new mon [Sun Apr 1 23:37:36 2018] libceph: mon2 10.80.20.103:6789 session established [Sun Apr 1 23:38:07 2018] libceph: mon2 10.80.20.103:6789 session lost, hunting for new mon [Sun Apr 1 23:38:07 2018] libceph: mon1 10.80.20.100:6789 session established [Sun Apr 1 23:38:37 2018] libceph: mon1 10.80.20.100:6789 session lost, hunting for new mon [Sun Apr 1 23:38:37 2018] libceph: mon2 10.80.20.103:6789 session established [Sun Apr 1 23:39:08 2018] libceph: mon2 10.80.20.103:6789 session lost, hunting for new mon The regular keepalive interval is 10 seconds. After ->hunting is cleared in finish_hunting(), call __schedule_delayed() to ensure we send out a keepalive after 10 seconds. Cc: stable@vger.kernel.org # 4.7+ Link: http://tracker.ceph.com/issues/23537 Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Reviewed-by: Jason Dillaman <dillaman@redhat.com>
-rw-r--r--net/ceph/mon_client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 02c441c12c38..21ac6e3b96bb 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -1133,6 +1133,7 @@ static void finish_hunting(struct ceph_mon_client *monc)
monc->hunting = false;
monc->had_a_connection = true;
un_backoff(monc);
+ __schedule_delayed(monc);
}
}