Commit dbeec07b authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

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: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 50c9132d

fs/ceph/mds_client.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

}

fs/ceph/super.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ struct ceph_fs_client { 


	int mount_state;



	unsigned long last_auto_reconnect;

	bool blocklisted;



	bool have_copy_from2;