From: Kefu Chai <kchai@redhat.com>
Date: Sun, 20 Dec 2020 16:21:54 +0000 (+0800)
Subject: crimson/osd: bail out if local version with requestor's when recovery
X-Git-Tag: v16.1.0~146^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13306a2e8e6105d4f9522106ee74081168f7fcfd;p=ceph.git

crimson/osd: bail out if local version with requestor's when recovery

this is a todo.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index c68661fffed..98619f03673 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -365,6 +365,10 @@ seastar::future<PushOp> ReplicatedRecoveryBackend::build_push_op(
       // If requestor didn't know the version, use ours
       if (v == eversion_t()) {
         v = local_ver;
+      } else if (v != local_ver) {
+        logger().error("build_push_op: {} push {} v{} failed because local copy is {}",
+                       pg.get_pgid(), recovery_info.soid, recovery_info.version, local_ver);
+        // TODO: bail out
       }
       return read_omap_for_push_op(recovery_info.soid,
                                    progress,