From 774016bd7639ab43a270faf66abb341e3afbff9c Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 11 Feb 2025 21:01:13 +0100 Subject: [PATCH] rbd: don't clone ioctx before calling get_mirror_peer_sites() get_mirror_peer_sites() transitions to the default namespace internally, doing it in advance at the call sites is redundant. Signed-off-by: Ilya Dryomov --- src/tools/rbd/action/MirrorImage.cc | 6 +----- src/tools/rbd/action/MirrorPool.cc | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/tools/rbd/action/MirrorImage.cc b/src/tools/rbd/action/MirrorImage.cc index 505d377f4807f..996d4c7ef4b53 100644 --- a/src/tools/rbd/action/MirrorImage.cc +++ b/src/tools/rbd/action/MirrorImage.cc @@ -314,12 +314,8 @@ int execute_status(const po::variables_map &vm, return r; } - librados::IoCtx default_ns_io_ctx; - default_ns_io_ctx.dup(io_ctx); - default_ns_io_ctx.set_namespace(""); - std::vector mirror_peers; - utils::get_mirror_peer_sites(default_ns_io_ctx, &mirror_peers); + utils::get_mirror_peer_sites(io_ctx, &mirror_peers); std::map peer_mirror_uuids_to_name; utils::get_mirror_peer_mirror_uuids_to_names(mirror_peers, diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc index 6a546c3f73a34..4f939adf2003d 100644 --- a/src/tools/rbd/action/MirrorPool.cc +++ b/src/tools/rbd/action/MirrorPool.cc @@ -1645,11 +1645,8 @@ int execute_status(const po::variables_map &vm, } // dump per-image status - librados::IoCtx default_ns_io_ctx; - default_ns_io_ctx.dup(io_ctx); - default_ns_io_ctx.set_namespace(""); std::vector mirror_peers; - utils::get_mirror_peer_sites(default_ns_io_ctx, &mirror_peers); + utils::get_mirror_peer_sites(io_ctx, &mirror_peers); std::map peer_mirror_uuids_to_name; utils::get_mirror_peer_mirror_uuids_to_names(mirror_peers, -- 2.39.5