]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-mirror: fix 'rbd mirror status' asok command output 32718/head
authorMykola Golub <mgolub@suse.com>
Mon, 30 Dec 2019 15:44:32 +0000 (17:44 +0200)
committerMykola Golub <mgolub@suse.com>
Sat, 18 Jan 2020 13:45:22 +0000 (15:45 +0200)
This was broken by def50d04796, and implicitly fixed during
refactoring in the master (octopus) by adf1486e46c, hence it is a
direct commit to nautilus branch.

Fixes: https://tracker.ceph.com/issues/43429
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 0a0fcc7da4573e8b3c82440226747a2cc377496b)

Conflicts:
src/tools/rbd_mirror/Mirror.cc (image_deleter section removed after luminous)

src/tools/rbd_mirror/Mirror.cc

index 4ba547eeb1a07b908e032b539fe17b4b2f20257a..d0cfb502de1dc084301ca83b159ffba5274e89f3 100644 (file)
@@ -318,6 +318,12 @@ void Mirror::print_status(Formatter *f, stringstream *ss)
   }
 
   m_image_deleter->print_status(f, ss);
+
+  if (f) {
+    f->close_section();
+    f->close_section();
+    f->flush(*ss);
+  }
 }
 
 void Mirror::start()