From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 11 Feb 2025 20:01:13 +0000 (+0100)
Subject: rbd: don't clone ioctx before calling get_mirror_peer_sites()
X-Git-Tag: testing/wip-mchangir-testing-20250303.143918-reef-debug~2^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1ed3f85eb827f19926f359f62a7a3e63f8b895ff;p=ceph-ci.git

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 <idryomov@gmail.com>
(cherry picked from commit 774016bd7639ab43a270faf66abb341e3afbff9c)
---

diff --git a/src/tools/rbd/action/MirrorImage.cc b/src/tools/rbd/action/MirrorImage.cc
index 505d377f480..996d4c7ef4b 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<librbd::mirror_peer_site_t> mirror_peers;
-  utils::get_mirror_peer_sites(default_ns_io_ctx, &mirror_peers);
+  utils::get_mirror_peer_sites(io_ctx, &mirror_peers);
 
   std::map<std::string, std::string> 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 7d02ac0aee1..d81c21507c4 100644
--- a/src/tools/rbd/action/MirrorPool.cc
+++ b/src/tools/rbd/action/MirrorPool.cc
@@ -1595,11 +1595,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<librbd::mirror_peer_site_t> mirror_peers;
-    utils::get_mirror_peer_sites(default_ns_io_ctx, &mirror_peers);
+    utils::get_mirror_peer_sites(io_ctx, &mirror_peers);
 
     std::map<std::string, std::string> peer_mirror_uuids_to_name;
     utils::get_mirror_peer_mirror_uuids_to_names(mirror_peers,