]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: remove code to bypass dumping empty header scrub info
authorDhairya Parmar <dparmar@redhat.com>
Mon, 22 May 2023 10:37:34 +0000 (16:07 +0530)
committerDhairya Parmar <dparmar@redhat.com>
Tue, 18 Jul 2023 17:02:27 +0000 (22:32 +0530)
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)

src/mds/ScrubStack.cc

index 6c2a6ac1a104ef641bc0e556cd986d4b31b6f43b..74a71b5f9001f0b4b6e60fe24e677b37f2ea792d 100644 (file)
@@ -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