From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 27 Feb 2020 17:44:48 +0000 (-0500)
Subject: rbd: do not show mirroring mode if not enabled
X-Git-Tag: v15.1.1~153^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df00b073850e7bff01dc88c3d0a8539e3ce89e70;p=ceph.git

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 2636535a22eb..f8d053cd76da 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") <<std::endl;