From: Jeff Layton <jlayton@kernel.org>
To: ceph-devel@vger.kernel.org
Cc: idryomov@gmail.com, ukernel@gmail.com, pdonnell@redhat.com
Subject: [PATCH v4 4/5] ceph: remove timeout on allowing reconnect after blocklisting
Date: Wed, 7 Oct 2020 08:16:59 -0400 [thread overview]
Message-ID: <20201007121700.10489-5-jlayton@kernel.org> (raw)
In-Reply-To: <20201007121700.10489-1-jlayton@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 <jlayton@kernel.org>
---
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 91de271d0093..240eee5baa0f 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 d0cb6a51c6a4..9ced23b092f5 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -108,7 +108,6 @@ struct ceph_fs_client {
int mount_state;
- unsigned long last_auto_reconnect;
bool blocklisted;
bool have_copy_from2;
--
2.26.2
next prev parent reply other threads:[~2020-10-07 12:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-07 12:16 [PATCH v4 0/5] ceph: fix spurious recover_session=clean errors Jeff Layton
2020-10-07 12:16 ` [PATCH v4 1/5] ceph: don't WARN when removing caps due to blocklisting Jeff Layton
2020-10-07 12:16 ` [PATCH v4 2/5] ceph: make fsc->mount_state an int Jeff Layton
2020-10-07 12:16 ` [PATCH v4 3/5] ceph: add new RECOVER mount_state when recovering session Jeff Layton
2020-10-07 12:16 ` Jeff Layton [this message]
2020-10-07 12:17 ` [PATCH v4 5/5] ceph: queue MDS requests to REJECTED sessions when CLEANRECOVER is set Jeff Layton
2020-10-20 7:03 ` [PATCH v4 0/5] ceph: fix spurious recover_session=clean errors Xiubo Li
2020-10-21 13:51 ` Yan, Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201007121700.10489-5-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=pdonnell@redhat.com \
--cc=ukernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).