Skip to content

Commit fa09e73

Browse files
authored
Merge pull request ceph#52086 from pkalever/fix-mirror-status-desc
rbd-mirror: fix image replayer shut down description on force promote Reviewed-by: Ramana Raja <[email protected]> Reviewed-by: Mykola Golub <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]>
2 parents c5d4dbf + 947a536 commit fa09e73

File tree

1 file changed

+5
-0
lines changed
  • src/tools/rbd_mirror/image_replayer/snapshot

1 file changed

+5
-0
lines changed

src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,11 @@ void Replayer<I>::scan_local_mirror_snapshots(
542542
if (m_local_mirror_snap_ns.is_non_primary() &&
543543
m_local_mirror_snap_ns.primary_mirror_uuid !=
544544
m_state_builder->remote_mirror_uuid) {
545+
if (m_local_mirror_snap_ns.is_orphan()) {
546+
dout(5) << "local image being force promoted" << dendl;
547+
handle_replay_complete(locker, 0, "orphan (force promoting)");
548+
return;
549+
}
545550
// TODO support multiple peers
546551
derr << "local image linked to unknown peer: "
547552
<< m_local_mirror_snap_ns.primary_mirror_uuid << dendl;

0 commit comments

Comments
 (0)