On Tue, 2019-09-10 at 21:09 +0800, chenerqi@xxxxxxxxx wrote: > From: chenerqi <chenerqi@xxxxxxxxx> > > If client mds session is evicted in CEPH_MDS_SESSION_OPENING state, > mds won't send session msg to client, and delayed_work skip > CEPH_MDS_SESSION_OPENING state session, the session hang forever. > ceph_con_keepalive reconnct connection for CEPH_MDS_SESSION_OPENING > session to avoid session hang. > > Fixes: https://tracker.ceph.com/issues/41551 > Signed-off-by: Erqi Chen chenerqi@xxxxxxxxx > --- > fs/ceph/mds_client.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c > index 937e887..8f382b5 100644 > --- a/fs/ceph/mds_client.c > +++ b/fs/ceph/mds_client.c > @@ -3581,7 +3581,9 @@ static void delayed_work(struct work_struct *work) > pr_info("mds%d hung\n", s->s_mds); > } > } > - if (s->s_state < CEPH_MDS_SESSION_OPEN) { > + if (s->s_state == CEPH_MDS_SESSION_NEW || > + s->s_state == CEPH_MDS_SESSION_RESTARTING || > + s->s_state == CEPH_MDS_SESSION_REJECTED) { > /* this mds is failed or recovering, just wait */ > ceph_put_mds_session(s); > continue; This has already been merged into the testing branch and should make v5.4. Was there a reason you decided to resend it? -- Jeff Layton <jlayton@xxxxxxxxxx>
