From b27152fe81da92d09d5acc049bef354fd617baf0 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Wed, 19 Mar 2025 23:47:10 +0530 Subject: [PATCH] rbd-mirror: look for mismatch in name only on secondary cluster Signed-off-by: Prasanna Kumar Kalever --- src/tools/rbd_mirror/GroupReplayer.cc | 5 +++++ src/tools/rbd_mirror/group_replayer/BootstrapRequest.cc | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd_mirror/GroupReplayer.cc b/src/tools/rbd_mirror/GroupReplayer.cc index 59d2e60482e1e..9f6dbb2716289 100644 --- a/src/tools/rbd_mirror/GroupReplayer.cc +++ b/src/tools/rbd_mirror/GroupReplayer.cc @@ -241,6 +241,11 @@ void GroupReplayer::destroy() { template void GroupReplayer::sync_group_names() { + if (m_local_group_ctx.primary) { + reregister_admin_socket_hook(); + return; + } + dout(10) << dendl; std::string local_group_name; diff --git a/src/tools/rbd_mirror/group_replayer/BootstrapRequest.cc b/src/tools/rbd_mirror/group_replayer/BootstrapRequest.cc index c6a8424f34381..7b1cdf473f679 100644 --- a/src/tools/rbd_mirror/group_replayer/BootstrapRequest.cc +++ b/src/tools/rbd_mirror/group_replayer/BootstrapRequest.cc @@ -595,8 +595,7 @@ void BootstrapRequest::handle_get_local_group_name(int r) { if (m_group_name.empty()) { m_group_name = local_group_name; - } else if (m_group_name != local_group_name) { - // should never happen + } else if (m_group_name != local_group_name && m_remote_mirror_group_primary) { derr << "local group name '" << local_group_name << "' does not match " << "remote group name '" << m_group_name << "'" << dendl; finish(-EINVAL); -- 2.39.5