]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd/replicated_recovery_backend: don't resolve_oid on recovery 57514/head
authorMatan Breizman <mbreizma@redhat.com>
Mon, 22 Apr 2024 08:29:22 +0000 (08:29 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Thu, 16 May 2024 11:53:49 +0000 (14:53 +0300)
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 48be64b686dee418595210733dbbe6411402adc8)

src/crimson/osd/replicated_recovery_backend.cc

index a62cb793272d5fc836b0b2c2c8311d23ef192c79..16f779961247b0af2e7220a88c756da365f424f2 100644 (file)
@@ -40,7 +40,7 @@ ReplicatedRecoveryBackend::recover_object(
       recovery_waiter.obc = obc;
       recovery_waiter.obc->wait_recovery_read();
       return maybe_push_shards(head, soid, need);
-    }).handle_error_interruptible(
+    }, false).handle_error_interruptible(
       crimson::osd::PG::load_obc_ertr::all_same_way([soid](auto& code) {
       // TODO: may need eio handling?
       logger().error("recover_object saw error code {}, ignoring object {}",
@@ -827,7 +827,7 @@ ReplicatedRecoveryBackend::_handle_pull_response(
                            pull_info.obc->ssc);
         }
         return crimson::osd::PG::load_obc_ertr::now();
-      }).handle_error_interruptible(crimson::ct_error::assert_all{});
+      }, false).handle_error_interruptible(crimson::ct_error::assert_all{});
   };
   return prepare_waiter.then_interruptible(
     [this, &pull_info, &push_op, t, response]() mutable {