From 8b1ab7e4d70098f4e1cd5e147c28f251ddd50fc6 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 20 Mar 2025 18:28:44 +0100 Subject: [PATCH] rbd: mirror_uuids -> mirror_uuid in remote mirror peer listing ... in "rbd mirror image status" and "rbd mirror pool status --verbose" formatted outputs. In unformatted outputs this value is shown in place of a name in case a site name isn't available. Signed-off-by: Ilya Dryomov --- src/tools/rbd/action/MirrorImage.cc | 2 +- src/tools/rbd/action/MirrorPool.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd/action/MirrorImage.cc b/src/tools/rbd/action/MirrorImage.cc index 996d4c7ef4b53..1a392ed989459 100644 --- a/src/tools/rbd/action/MirrorImage.cc +++ b/src/tools/rbd/action/MirrorImage.cc @@ -412,7 +412,7 @@ int execute_status(const po::variables_map &vm, auto name_it = peer_mirror_uuids_to_name.find(status.mirror_uuid); formatter->dump_string("site_name", (name_it != peer_mirror_uuids_to_name.end() ? name_it->second : "")); - formatter->dump_string("mirror_uuids", status.mirror_uuid); + formatter->dump_string("mirror_uuid", status.mirror_uuid); formatter->dump_string("state", utils::mirror_image_site_status_state( status)); diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc index bf52c1a017694..b0678a38d1137 100644 --- a/src/tools/rbd/action/MirrorPool.cc +++ b/src/tools/rbd/action/MirrorPool.cc @@ -680,7 +680,7 @@ protected: m_formatter->dump_string("site_name", (name_it != m_peer_mirror_uuids_to_name.end() ? name_it->second : "")); - m_formatter->dump_string("mirror_uuids", status.mirror_uuid); + m_formatter->dump_string("mirror_uuid", status.mirror_uuid); m_formatter->dump_string( "state", utils::mirror_image_site_status_state(status)); -- 2.39.5