From a401e031835f57d3dfba9a7c8ac20f1a769e4b4f Mon Sep 17 00:00:00 2001 From: Dhairya Parmar Date: Mon, 22 May 2023 16:06:24 +0530 Subject: [PATCH] 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 (cherry picked from commit 2f06feea33c88798e4e9d654bbff8b05e77f0681) --- src/mds/MDCache.cc | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 7c7e98760e9..9c135194339 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -12958,24 +12958,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) -- 2.47.3