From: Xiubo Li <xiubli@xxxxxxxxxx>
If all the MDS daemons are down for some reasons and for the first
time to do the mount, it will fail with IO error after the mount
request timed out.
Or if the cluster becomes laggy suddenly, and just before the kclient
getting the new mdsmap and the mount request is fired off, it also
will fail with IO error.
This will add some useful hint message by checking the cluster state
before the fail the mount operation.
Signed-off-by: Xiubo Li <xiubli@xxxxxxxxxx>
---
fs/ceph/mds_client.c | 4 ++--
fs/ceph/super.c | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 109ec7e2ee7b..163b470f3000 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2556,7 +2556,7 @@ static void __do_request(struct ceph_mds_client *mdsc,
CEPH_MOUNT_OPT_MOUNTWAIT) &&
!ceph_mdsmap_is_cluster_available(mdsc->mdsmap)) {
err = -ENOENT;
- pr_info("probably no mds server is up\n");
+ pr_info("No mds server is up or the cluster is laggy\n");
goto finish;
}
}
@@ -2706,7 +2706,7 @@ static int ceph_mdsc_wait_request(struct ceph_mds_client *mdsc,
if (timeleft > 0)
err = 0;
else if (!timeleft)
- err = -EIO; /* timed out */
+ err = -ETIMEDOUT; /* timed out */
else
err = timeleft; /* killed */
}
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index af2754b80b7c..39810677e601 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -1137,6 +1137,10 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type,
return res;
out_splat:
+ if (PTR_ERR(res) == -ETIMEDOUT &&
+ !ceph_mdsmap_is_cluster_available(fsc->mdsc->mdsmap))
+ pr_info("No mds server is up or the cluster is laggy\n");
+
ceph_mdsc_close_sessions(fsc->mdsc);
deactivate_locked_super(sb);
goto out_final;
--
2.21.0
