From 744a4648feb29b5975621b4890fef905c6c3abe8 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Thu, 3 Apr 2025 17:19:08 +0530 Subject: [PATCH] librbd/api: cleanup prepare_group_images to dup group_ioctx .. dup group_ioctx instead of changing to default namespace and resetting back to original Signed-off-by: Prasanna Kumar Kalever --- src/librbd/api/Mirror.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librbd/api/Mirror.cc b/src/librbd/api/Mirror.cc index 750b6105641d4..f52d367b2a312 100644 --- a/src/librbd/api/Mirror.cc +++ b/src/librbd/api/Mirror.cc @@ -2449,15 +2449,15 @@ int prepare_group_images(IoCtx& group_ioctx, CephContext *cct = (CephContext *)group_ioctx.cct(); ldout(cct, 20) << dendl; - auto ns = group_ioctx.get_namespace(); - group_ioctx.set_namespace(""); + librados::IoCtx default_ns_ioctx; + default_ns_ioctx.dup(group_ioctx); + default_ns_ioctx.set_namespace(""); std::vector peers; - int r = cls_client::mirror_peer_list(&group_ioctx, &peers); + int r = cls_client::mirror_peer_list(&default_ns_ioctx, &peers); if (r < 0) { lderr(cct) << "error reading mirror peers: " << cpp_strerror(r) << dendl; return r; } - group_ioctx.set_namespace(ns); for (auto &peer : peers) { if (peer.mirror_peer_direction == cls::rbd::MIRROR_PEER_DIRECTION_RX) { -- 2.39.5