From: Dhairya Parmar <dparmar@redhat.com>
Date: Mon, 22 May 2023 10:36:24 +0000 (+0530)
Subject: mds: dump_values no more needed
X-Git-Tag: v16.2.14~51^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93bd8554f766de502865fc4444395514eccffb78;p=ceph.git

mds: dump_values no more needed

Previouly, two individual scrubs were initiated to scrub ~mdsdir
at root where the ~mdsdir scrub wasn't provided any tag thus, it
was necessary to not dump it's values for output of 'scrub start'.
Now since mdsdir and root scrub run under single header, there is
no need for this anymore, thus removing this redundant code.

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 5371cba5908f..8a6ef0f2c56e 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12756,24 +12756,19 @@ class C_MDS_EnqueueScrub : public Context
   std::string tag;
   Formatter *formatter;
   Context *on_finish;
-  bool dump_values;
 public:
   ScrubHeaderRef header;
-  C_MDS_EnqueueScrub(std::string_view tag, Formatter *f, Context *fin,
-                     bool dump_values = true) :
-    tag(tag), formatter(f), on_finish(fin), dump_values(dump_values),
-    header(nullptr) {}
+  C_MDS_EnqueueScrub(std::string_view tag, Formatter *f, Context *fin) :
+    tag(tag), formatter(f), on_finish(fin), header(nullptr) {}
 
   void finish(int r) override {
-    if (dump_values) {
-      formatter->open_object_section("results");
-      formatter->dump_int("return_code", r);
-      if (r == 0) {
-        formatter->dump_string("scrub_tag", tag);
-        formatter->dump_string("mode", "asynchronous");
-      }
-      formatter->close_section();
+    formatter->open_object_section("results");
+    formatter->dump_int("return_code", r);
+    if (r == 0) {
+      formatter->dump_string("scrub_tag", tag);
+      formatter->dump_string("mode", "asynchronous");
     }
+    formatter->close_section();
 
     r = 0;
     if (on_finish)