From: Dhairya Parmar <dparmar@redhat.com>
Date: Mon, 22 May 2023 10:37:34 +0000 (+0530)
Subject: mds: remove code to bypass dumping empty header scrub info
X-Git-Tag: v16.2.14~51^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef5670107a28a3a64856fa508e6fec0446b4d49b;p=ceph.git

mds: remove code to bypass dumping empty header scrub info

Previously when ~mdsdir was scrubbed at CephFS root, it's header
was kept empty, thus it became necessary to not dump it's values
for 'scrub status'. Now since both the scrubs(~mdsdir and root)
run under the same header, this code is no more needed.

Fixes: https://tracker.ceph.com/issues/59350
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit 548af10f1057fe3fb46e23887b012a664b45b7f8)
---

diff --git a/src/mds/ScrubStack.cc b/src/mds/ScrubStack.cc
index 6c2a6ac1a104..74a71b5f9001 100644
--- a/src/mds/ScrubStack.cc
+++ b/src/mds/ScrubStack.cc
@@ -646,11 +646,6 @@ void ScrubStack::scrub_status(Formatter *f) {
     have_more = false;
     auto& header = p.second;
 
-    if (mdcache->get_inode(header->get_origin())->is_mdsdir() 
-    && header->get_scrub_mdsdir() && header->get_tag().empty()) {
-      continue;
-    }
-
     std::string tag(header->get_tag());
     f->open_object_section(tag.c_str()); // scrub id