From df00b073850e7bff01dc88c3d0a8539e3ce89e70 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Thu, 27 Feb 2020 12:44:48 -0500 Subject: [PATCH] rbd: do not show mirroring mode if not enabled The 'info' action was incorrectly showing the mirroring mode when mirroring was not enabled. Signed-off-by: Jason Dillaman --- src/tools/rbd/action/Info.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/rbd/action/Info.cc b/src/tools/rbd/action/Info.cc index 2636535a22e..f8d053cd76d 100644 --- a/src/tools/rbd/action/Info.cc +++ b/src/tools/rbd/action/Info.cc @@ -382,12 +382,12 @@ static int do_show_info(librados::IoCtx &io_ctx, librbd::Image& image, } f->close_section(); } else { - std::cout << "\tmirroring mode: " - << utils::mirror_image_mode(mirror_mode) << std::endl; std::cout << "\tmirroring state: " << utils::mirror_image_state(mirror_image.state) << std::endl; if (mirror_image.state != RBD_MIRROR_IMAGE_DISABLED) { - std::cout << "\tmirroring global id: " << mirror_image.global_id + std::cout << "\tmirroring mode: " + << utils::mirror_image_mode(mirror_mode) << std::endl + << "\tmirroring global id: " << mirror_image.global_id << std::endl << "\tmirroring primary: " << (mirror_image.primary ? "true" : "false") <