diff options
| author | Jeff Layton <jlayton@kernel.org> | 2020-09-25 16:07:49 +0300 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2020-12-15 01:21:46 +0300 |
| commit | dbeec07bc84f8229322d7919692a17adae1e388e (patch) | |
| tree | 12d441164bdb369d3e4118f4af227e2f8f00b0eb | |
| parent | 50c9132ddfb2024e96900407beeec660cf9848bd (diff) | |
| download | linux-dbeec07bc84f8229322d7919692a17adae1e388e.tar.xz | |
ceph: remove timeout on allowing reconnect after blocklisting
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>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
| -rw-r--r-- | fs/ceph/mds_client.c | 5 | ||||
| -rw-r--r-- | fs/ceph/super.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index a2d6ef808f70..de95e08815c0 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 f9e35e81c9af..f097237a5ad3 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; |