From: Xiubo Li <xiubli@xxxxxxxxxx>
This reverts commit f7a67b463fb83a4b9b11ceaa8ec4950b8fb7f902.
We have identified an issue in the MDS affecting CephFS users using
the kernel driver. The issue was first introduced in the octopus
release that added support for clients to perform asynchronous
directory operations using the `nowsync` mount option. The issue
presents itself as an MDS crash resembling (any of) the following
crashes:
https://tracker.ceph.com/issues/61009
https://tracker.ceph.com/issues/58489
There is no apparent data loss or corruption, but since the underlying
cause is related to an (operation) ordering issue, the extent of the
problem could surface in other forms - most likely MDS crashes
involving preallocated inodes.
The fix is being reviewed and is being worked on priority:
https://github.com/ceph/ceph/pull/53752
As a workaround, we recommend (kernel) clients be remounted with the
`wsync` mount option which disables asynchronous directory operations
(depending on the kernel version being used, the default could be
`nowsync`).
This change reverts the default, so, async dirops is disabled (by default).
Signed-off-by: Xiubo Li <xiubli@xxxxxxxxxx>
Signed-off-by: Venky Shankar <vshankar@xxxxxxxxxx>
---
fs/ceph/super.c | 4 ++--
fs/ceph/super.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 5ec102f6b1ac..2bf6ccc9887b 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -742,8 +742,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
if (fsopt->flags & CEPH_MOUNT_OPT_CLEANRECOVER)
seq_show_option(m, "recover_session", "clean");
- if (!(fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS))
- seq_puts(m, ",wsync");
+ if (fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS)
+ seq_puts(m, ",nowsync");
if (fsopt->flags & CEPH_MOUNT_OPT_NOPAGECACHE)
seq_puts(m, ",nopagecache");
if (fsopt->flags & CEPH_MOUNT_OPT_SPARSEREAD)
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 7f4b62182a5d..a5476892896c 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -47,8 +47,7 @@
#define CEPH_MOUNT_OPT_DEFAULT \
(CEPH_MOUNT_OPT_DCACHE | \
- CEPH_MOUNT_OPT_NOCOPYFROM | \
- CEPH_MOUNT_OPT_ASYNC_DIROPS)
+ CEPH_MOUNT_OPT_NOCOPYFROM)
#define ceph_set_mount_opt(fsc, opt) \
(fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt
--
2.41.0
