Skip to content

Commit 8b1ab7e

Browse files
committed
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 <[email protected]>
1 parent 95fc1f8 commit 8b1ab7e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/tools/rbd/action/MirrorImage.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ int execute_status(const po::variables_map &vm,
412412
auto name_it = peer_mirror_uuids_to_name.find(status.mirror_uuid);
413413
formatter->dump_string("site_name",
414414
(name_it != peer_mirror_uuids_to_name.end() ? name_it->second : ""));
415-
formatter->dump_string("mirror_uuids", status.mirror_uuid);
415+
formatter->dump_string("mirror_uuid", status.mirror_uuid);
416416

417417
formatter->dump_string("state", utils::mirror_image_site_status_state(
418418
status));

src/tools/rbd/action/MirrorPool.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ class StatusImageRequest : public ImageRequestBase {
680680
m_formatter->dump_string("site_name",
681681
(name_it != m_peer_mirror_uuids_to_name.end() ?
682682
name_it->second : ""));
683-
m_formatter->dump_string("mirror_uuids", status.mirror_uuid);
683+
m_formatter->dump_string("mirror_uuid", status.mirror_uuid);
684684

685685
m_formatter->dump_string(
686686
"state", utils::mirror_image_site_status_state(status));

0 commit comments

Comments
 (0)