Merge PR ceph#57688 into main

* refs/pull/57688/head:
	tools/first-damage: Don't skip stray directory object

Reviewed-by: Dhairya Parmar <[email protected]>
Reviewed-by: Venky Shankar <[email protected]>
Reviewed-by: Patrick Donnelly <[email protected]>

Author: batrick

src/tools/cephfs/first-damage.py

@@ -64,12 +64,15 @@
 LOST_FOUND_INODE  = "4.00000000"
 
 DIR_PATTERN = re.compile(r'[0-9a-fA-F]{8,}\.[0-9a-fA-F]+')
+STRAY_DIR_PATTERN = re.compile(r'6[0-9a-fA-F]{2,}\.[0-9a-fA-F]+')
 
 CACHE = set()
 
 def traverse(MEMO, ioctx):
     for o in ioctx.list_objects():
-        if not DIR_PATTERN.fullmatch(o.key) and o.key not in [ROOT_INODE, LOST_FOUND_INODE]:
+        if (not DIR_PATTERN.fullmatch(o.key) and
+            not STRAY_DIR_PATTERN.fullmatch(o.key)
+            and o.key not in [ROOT_INODE, LOST_FOUND_INODE]):
             log.debug("skipping %s", o.key)
             continue
         elif o.key in CACHE: