From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4354FA3728 for ; Wed, 16 Oct 2019 21:54:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE2C621A49 for ; Wed, 16 Oct 2019 21:54:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262870; bh=DdXffDv43Dzcs2A5WSrvHVsPPlFVTzzPNg20It8U2EU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HRlRrk9XGg5No9RcOWn98e2Gymt/gXxzR1O24GM+FXPQya+7o4/29AhW/URo6qGpa zqX3WgMkP0GW6i1zsbDOAamrqsL8xypRCIVqvvNaldnI4M5gP1tFVdpRKdx0ytKgqK YP/wmad/zcwFR/rVyxXjiroqUJQzjcPgJUqbmXi4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395009AbfJPVy3 (ORCPT ); Wed, 16 Oct 2019 17:54:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:43964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727832AbfJPVyO (ORCPT ); Wed, 16 Oct 2019 17:54:14 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A861521A49; Wed, 16 Oct 2019 21:54:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262853; bh=DdXffDv43Dzcs2A5WSrvHVsPPlFVTzzPNg20It8U2EU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tJjScAh3+Ua6ukoztvDUX2UuYcjp2wNjrPRdds4h0e+YhHUuvu0XcJH/GpSHREY7k fsICQOANlFciaNSXLNkpiLoW54/LLep2sizgosONW5Nc+ZSkhNCoLFSFWvWqIMREZF GbHQqJdphNlMwJTqUJcig6VKGT1RT9mNgyM1up1Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Yan, Zheng" , Jeff Layton , Ilya Dryomov , Sasha Levin Subject: [PATCH 4.9 20/92] ceph: reconnect connection if session hang in opening state Date: Wed, 16 Oct 2019 14:49:53 -0700 Message-Id: <20191016214816.727736806@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Erqi Chen [ Upstream commit 71a228bc8d65900179e37ac309e678f8c523f133 ] 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. Allow ceph_con_keepalive to reconnect a session in OPENING to avoid session hang. Also, ensure that we skip sessions in RESTARTING and REJECTED states since those states can't be resurrected by issuing a keepalive. Link: https://tracker.ceph.com/issues/41551 Signed-off-by: Erqi Chen chenerqi@gmail.com Reviewed-by: "Yan, Zheng" Signed-off-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- 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 67cb9d078bfa7..3139fbd4c34e3 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -3410,7 +3410,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; -- 2.20.1