]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: dump minimal cli output during recursive scrub trigger
authorVenky Shankar <vshankar@redhat.com>
Mon, 9 Jul 2018 06:42:06 +0000 (02:42 -0400)
committerVenky Shankar <vshankar@redhat.com>
Tue, 17 Jul 2018 09:20:43 +0000 (05:20 -0400)
Signed-off-by: Venky Shankar <vshankar@redhat.com>
src/mds/MDCache.cc

index 974e9f242476655d15a09f57dffb13224e6080a4..b0f89d5ceaca10ec50b8babd4a44b819112c2598 100644 (file)
@@ -12316,6 +12316,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)