From 4cef219bccc83ddcabdee5cf922df177a1b7b12f Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Mon, 22 Apr 2024 08:29:22 +0000 Subject: [PATCH] crimson/osd/replicated_recovery_backend: don't resolve_oid on recovery Signed-off-by: Matan Breizman (cherry picked from commit 48be64b686dee418595210733dbbe6411402adc8) --- src/crimson/osd/replicated_recovery_backend.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc index a62cb793272d5..16f779961247b 100644 --- a/src/crimson/osd/replicated_recovery_backend.cc +++ b/src/crimson/osd/replicated_recovery_backend.cc @@ -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 { -- 2.39.5