From patchwork Wed Sep 30 12:10:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 284842 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=-13.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 B51EDC47426 for ; Wed, 30 Sep 2020 12:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73FD6206B7 for ; Wed, 30 Sep 2020 12:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601467831; bh=dzK5f1+oVyN6ZBey267IGXxdgShC116w1VoBnyfoQSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NiwEMNTnkLGDP6+JPS5aGJz4teEAhPjTvuGyFy1mNqJaCj8TOBSPhH56oL8Ofp8+D uHLxCy5M44NSWPpkWAVi1A1rmSak+W3mX/ghA+8boFd/DR8qey19v9gJNE4NRmOfEl SR1d7cXBRSJWglwy2l2CdaPd9pb+ioWMGW2tffvA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729737AbgI3MKa (ORCPT ); Wed, 30 Sep 2020 08:10:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:40678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729694AbgI3MKa (ORCPT ); Wed, 30 Sep 2020 08:10:30 -0400 Received: from tleilax.com (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (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 B5185207C3; Wed, 30 Sep 2020 12:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601467830; bh=dzK5f1+oVyN6ZBey267IGXxdgShC116w1VoBnyfoQSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nKKQQDNMR/N26l73m9/SVfF3wcfB9AL0QbP34d2fCs4kHPUvz+Lk/9uVrAp25jG15 PDNq3MeTYqJKuVLoxjGzq6m0rVY/v3+vt/GrdzuACTf6yohlAcsU8JGitCUeFsN3Ri GiBhlRyLxmGVLyXtXZsHM3vQvzAIaW4pikbCh+Jw= From: Jeff Layton To: ceph-devel@vger.kernel.org Cc: idryomov@gmail.com, ukernel@gmail.com, pdonnell@redhat.com Subject: [RFC PATCH v2 3/4] ceph: remove timeout on allowing reconnect after blocklisting Date: Wed, 30 Sep 2020 08:10:24 -0400 Message-Id: <20200930121025.9257-4-jlayton@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200930121025.9257-1-jlayton@kernel.org> References: <20200925140851.320673-1-jlayton@kernel.org> <20200930121025.9257-1-jlayton@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org 30 minutes is a long time to wait, and this makes it difficult to test the feature by manually blocklisting clients. Remove the timeout infrastructure and just allow the client to reconnect at will. Signed-off-by: Jeff Layton --- fs/ceph/mds_client.c | 5 ----- fs/ceph/super.h | 1 - 2 files changed, 6 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 08f1c0c31dc2..fd16db6ecb0a 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -4374,12 +4374,7 @@ static void maybe_recover_session(struct ceph_mds_client *mdsc) if (!READ_ONCE(fsc->blocklisted)) return; - if (fsc->last_auto_reconnect && - time_before(jiffies, fsc->last_auto_reconnect + HZ * 60 * 30)) - return; - pr_info("auto reconnect after blocklisted\n"); - fsc->last_auto_reconnect = jiffies; ceph_force_reconnect(fsc->sb); } diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 582694899130..cb138e218ab4 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -108,7 +108,6 @@ struct ceph_fs_client { unsigned long mount_state; - unsigned long last_auto_reconnect; bool blocklisted; bool have_copy_from2;