]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: handle error using handle_error() 38582/head
authorKefu Chai <kchai@redhat.com>
Tue, 15 Dec 2020 09:21:08 +0000 (17:21 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 15 Dec 2020 09:21:10 +0000 (17:21 +0800)
no need to use safe_then() for this purpose.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/replicated_recovery_backend.cc

index 2fba82c447894ecbf75a5b39b83dd80871ef6f0b..4eab88f18dc0de35e1341fcc20c9d4e635f1b479 100644 (file)
@@ -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();
   }));
 }