From 4c4e3f5f08dcf0ffc95ee8ccf8182e4f757fd4a9 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sat, 28 May 2022 10:04:11 +0200 Subject: [PATCH] cls/rbd: fix operator<< for MirrorSnapshotNamespace Commit 50702eece0b1 ("cls/rbd: added clean_since_snap_id to MirrorSnapshotNamespace") updated dump() but missed operator<< overload. Signed-off-by: Ilya Dryomov (cherry picked from commit 8ddce107d02bbf3021a53a2861024f66a3ec0918) --- src/cls/rbd/cls_rbd_types.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/cls/rbd/cls_rbd_types.cc b/src/cls/rbd/cls_rbd_types.cc index ce424f7c36a1..e47f227777b8 100644 --- a/src/cls/rbd/cls_rbd_types.cc +++ b/src/cls/rbd/cls_rbd_types.cc @@ -1001,12 +1001,16 @@ std::ostream& operator<<(std::ostream& os, const MirrorSnapshotNamespace& ns) { os << "[" << SNAPSHOT_NAMESPACE_TYPE_MIRROR << " " << "state=" << ns.state << ", " << "complete=" << ns.complete << ", " - << "mirror_peer_uuids=" << ns.mirror_peer_uuids << ", " - << "primary_mirror_uuid=" << ns.primary_mirror_uuid << ", " - << "primary_snap_id=" << ns.primary_snap_id << ", " - << "last_copied_object_number=" << ns.last_copied_object_number << ", " - << "snap_seqs=" << ns.snap_seqs - << "]"; + << "mirror_peer_uuids=" << ns.mirror_peer_uuids << ", "; + if (ns.is_primary()) { + os << "clean_since_snap_id=" << ns.clean_since_snap_id; + } else { + os << "primary_mirror_uuid=" << ns.primary_mirror_uuid << ", " + << "primary_snap_id=" << ns.primary_snap_id << ", " + << "last_copied_object_number=" << ns.last_copied_object_number << ", " + << "snap_seqs=" << ns.snap_seqs; + } + os << "]"; return os; } -- 2.47.3