]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mon: set session_timeout when adding to session_map 37554/head
authorIlya Dryomov <idryomov@gmail.com>
Tue, 29 Sep 2020 13:29:16 +0000 (15:29 +0200)
committerVicente Cheng <freeze.bilsted@gmail.com>
Mon, 5 Oct 2020 15:46:25 +0000 (15:46 +0000)
commitd6d23592d48980baa4c916e28eaa4930c8ae043f
tree9bc96b9314600e24eb3c0f83233b33e2d0b09796
parent1cbf861ec989ff9670777441005e43e826fd7c2e
mon: set session_timeout when adding to session_map

With msgr2, the session is added in Monitor::ms_handle_accept()
which is queued by ProtocolV2 at the end of handling CLIENT_IDENT
frame, before responding with SERVER_IDENT frame.  session_timeout
is 0 and gets set only in Monitor::ms_dispatch(), so if the session
trimming code in Monitor::tick() gets to the session before the peer
receives our SERVER_IDENT, handles it, sends the first message and
we receive it, the session is wrongly closed.

This doesn't happen with msgr1, because there the session is added in
Monitor::ms_dispatch(), upon receive of the first message (MSG_AUTH).

Fixes: https://tracker.ceph.com/issues/47697
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 76fbe8b4aaad7f39b37baf2f2d0128e9fe5c29a6)
src/mon/Session.h