From: Venky Shankar <vshankar@redhat.com>
Date: Mon, 9 Jul 2018 06:42:06 +0000 (-0400)
Subject: mds: dump minimal cli output during recursive scrub trigger
X-Git-Tag: v12.2.8~92^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ece1f2d95763d07f23d9bf5ac2ee0a2812373fa;p=ceph.git

mds: dump minimal cli output during recursive scrub trigger

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit a70d21b162e00e49813f25149fa93442f5434e0b)
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 887c1062779..a18a5f7bdc7 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -12124,6 +12124,13 @@ void MDCache::enqueue_scrub(
 
   mdr->internal_op_finish = cs;
   enqueue_scrub_work(mdr);
+
+  // since recursive scrub is asynchronous, dump minimal output
+  // to not upset cli tools.
+  if (recursive) {
+    f->open_object_section("results");
+    f->close_section(); // results
+  }
 }
 
 void MDCache::enqueue_scrub_work(MDRequestRef& mdr)