Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd4e1894 authored by Xiubo Li's avatar Xiubo Li Committed by Greg Kroah-Hartman
Browse files

ceph: check availability of mds cluster on mount after wait timeout 

[ Upstream commit 97820058fb2831a4b203981fa2566ceaaa396103 ]

If all the MDS daemons are down for some reason, then the first mount
attempt will fail with EIO after the mount request times out.  A mount
attempt will also fail with EIO if all of the MDS's are laggy.

This patch changes the code to return -EHOSTUNREACH in these situations
and adds a pr_info error message to help the admin determine the cause.

URL: https://tracker.ceph.com/issues/4386


Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7288d533

fs/ceph/mds_client.c

+1 −2
Original line number Diff line number Diff line
@@ -2552,8 +2552,7 @@ static void __do_request(struct ceph_mds_client *mdsc, 
		if (!(mdsc->fsc->mount_options->flags &

		      CEPH_MOUNT_OPT_MOUNTWAIT) &&

		    !ceph_mdsmap_is_cluster_available(mdsc->mdsmap)) {

			err = -ENOENT;

			pr_info("probably no mds server is up\n");

			err = -EHOSTUNREACH;

			goto finish;

		}

	}

fs/ceph/super.c

+5 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,11 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type, 
	return res;



out_splat:

	if (!ceph_mdsmap_is_cluster_available(fsc->mdsc->mdsmap)) {

		pr_info("No mds server is up or the cluster is laggy\n");

		err = -EHOSTUNREACH;

	}



	ceph_mdsc_close_sessions(fsc->mdsc);

	deactivate_locked_super(sb);

	goto out_final;