diff options
| author | Patrick Donnelly <pdonnell@redhat.com> | 2023-09-15 20:38:02 +0200 |
|---|---|---|
| committer | Patrick Donnelly <pdonnell@redhat.com> | 2023-09-15 20:38:02 +0200 |
| commit | 6c387554d8e104727b3e448a1def4f1991be1ff7 (patch) | |
| tree | 2b8b07e349fa1563fe4a3fc8156cb8970688f61e /src/mds/CDentry.cc | |
| parent | Merge PR #52199 into main (diff) | |
| parent | mds: flush monc log before abort (diff) | |
| download | ceph-6c387554d8e104727b3e448a1def4f1991be1ff7.tar.xz ceph-6c387554d8e104727b3e448a1def4f1991be1ff7.zip | |
Merge PR #52638 into main
* refs/pull/52638/head:
mds: flush monc log before abort
qa: check for expected cluster log message
qa: ignore expected cluster warning from damage tests
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Diffstat (limited to 'src/mds/CDentry.cc')
| -rw-r--r-- | src/mds/CDentry.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc index c64aed3aa47..b6d169b9e0f 100644 --- a/src/mds/CDentry.cc +++ b/src/mds/CDentry.cc @@ -714,7 +714,7 @@ bool CDentry::check_corruption(bool load) } if (!load && g_conf().get_val<bool>("mds_abort_on_newly_corrupt_dentry")) { dir->mdcache->mds->clog->error() << "MDS abort because newly corrupt dentry to be committed: " << *this; - ceph_abort("detected newly corrupt dentry"); /* avoid writing out newly corrupted dn */ + dir->mdcache->mds->abort("detected newly corrupt dentry"); /* avoid writing out newly corrupted dn */ } return true; } |