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 <dillaman@redhat.com>

diff --git a/src/tools/rbd/action/Info.cc b/src/tools/rbd/action/Info.cc
index 2636535a22eba83b75cb39fd57c10e4d364a650b..f8d053cd76dad553effe6f18c8a1201b40349602 100644 (file)
--- 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") <<std::endl;