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>
This commit is contained in:
Jeff Layton 2020-09-25 09:07:49 -04:00 коммит произвёл Ilya Dryomov
Родитель 50c9132ddf
Коммит dbeec07bc8
2 изменённых файлов: 0 добавлений и 6 удалений

Просмотреть файл

@ -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);
}

Просмотреть файл

@ -108,7 +108,6 @@ struct ceph_fs_client {
int mount_state;
unsigned long last_auto_reconnect;
bool blocklisted;
bool have_copy_from2;