From cc9a63ab5764c30e1df31fb15c26b58c5cff49d4 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 15 Dec 2020 17:21:08 +0800 Subject: [PATCH] crimson/osd: handle error using handle_error() no need to use safe_then() for this purpose. Signed-off-by: Kefu Chai --- src/crimson/osd/replicated_recovery_backend.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc index 2fba82c447894..4eab88f18dc0d 100644 --- a/src/crimson/osd/replicated_recovery_backend.cc +++ b/src/crimson/osd/replicated_recovery_backend.cc @@ -97,13 +97,11 @@ ReplicatedRecoveryBackend::maybe_push_shards( recovery_waiter.obc = obc; recovery_waiter.obc->wait_recovery_read(); return seastar::futurize_invoke(std::move(push_func)); - }).template safe_then( - [] { return seastar::now(); }, + }).handle_error( 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 {}", code, soid); - return seastar::now(); })); } -- 2.39.5