From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 24 Aug 2022 17:11:10 +0000 (-0400)
Subject: mds: cluster log scrub failure for dirfrag
X-Git-Tag: v16.2.13~55^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ade851016a34f1c494b731e749f27a7edccfbc97;p=ceph.git

mds: cluster log scrub failure for dirfrag

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 40f483ed457a24cfdab343875ab98ca1240850a6)
---

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index 84441fcf6620..4bf1a7932985 100644
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -424,7 +424,13 @@ void ScrubStack::scrub_dirfrag(CDir *dir, bool *done)
     }
   }
 
-  dir->scrub_local();
+  if (!dir->scrub_local()) {
+    std::string path;
+    dir->get_inode()->make_path_string(path, true);
+    clog->warn() << "Scrub error on dir " << dir->ino()
+                 << " (" << path << ") see " << g_conf()->name
+                 << " log and `damage ls` output for details";
+  }
 
   dir->scrub_finished();
   dir->auth_unpin(this);