From: Mykola Golub <mgolub@suse.com>
Date: Mon, 30 Dec 2019 15:44:32 +0000 (+0200)
Subject: rbd-mirror: fix 'rbd mirror status' asok command output
X-Git-Tag: v12.2.14~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c9322878ef10828909a8d18ede7c55af1f72a72;p=ceph.git

rbd-mirror: fix 'rbd mirror status' asok command output

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)
---

diff --git a/src/tools/rbd_mirror/Mirror.cc b/src/tools/rbd_mirror/Mirror.cc
index 4ba547eeb1a0..d0cfb502de1d 100644
--- a/src/tools/rbd_mirror/Mirror.cc
+++ b/src/tools/rbd_mirror/Mirror.cc
@@ -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()