update ceph source to reef 18.2.1

[ceph.git] / ceph / src / tools / rbd_mirror / image_replayer / snapshot / Replayer.cc

diff --git a/ceph/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc b/ceph/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
index 3561f6fc699419ddb9b229e63e568f53066615b3..67eaa97779d7ef83cf374fa5d055ef634e393c4e 100644 (file)
--- a/ceph/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
+++ b/ceph/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
@@ -542,6 +542,11 @@ void Replayer<I>::scan_local_mirror_snapshots(
     if (m_local_mirror_snap_ns.is_non_primary() &&
         m_local_mirror_snap_ns.primary_mirror_uuid !=
           m_state_builder->remote_mirror_uuid) {
+      if (m_local_mirror_snap_ns.is_orphan()) {
+        dout(5) << "local image being force promoted" << dendl;
+        handle_replay_complete(locker, 0, "orphan (force promoting)");
+        return;
+      }
       // TODO support multiple peers
       derr << "local image linked to unknown peer: "
            << m_local_mirror_snap_ns.primary_mirror_uuid << dendl;