Merge pull request #55735 from xxhdx1985126/wip-crimson-errorator-void-handler

crimson/common/errorator: disallow void-returning error handlers

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>

diff --cc src/crimson/common/interruptible_future.h
Simple merge

diff --cc src/crimson/os/cyanstore/cyan_store.h
Simple merge

diff --cc src/crimson/os/seastore/seastore.cc
Simple merge

diff --cc src/crimson/os/seastore/seastore.h
index 75dbaf54f35b5a7f43b164e0a0f04a1ad9e41dd2,675fe359ffe024e912582d22c1e682213bb5c2fd..3de8a812e1291c70b76d34aa7e3579bd102abe0e
--- 1/src/crimson/os/seastore/seastore.h
--- 2/src/crimson/os/seastore/seastore.h
+++ b/src/crimson/os/seastore/seastore.h
@@@ -255,8 -253,10 +255,9 @@@ public
            ctx.reset_preserve_handle(*transaction_manager);
            return std::invoke(f, ctx);
          }).handle_error(
 -          crimson::ct_error::eagain::pass_further{},
            crimson::ct_error::all_same_way([&ctx](auto e) {
              on_error(ctx.ext_transaction);
+             return seastar::now();
            })
          );
        }).then([this, op_type, &ctx] {

diff --cc src/crimson/os/seastore/transaction_manager.cc
index 829237755a288cf44afb8b026921f2825e67925b,234afb674c1d73766fdf0cac7494ee4cbefa943e..654ddc7c6d2ed61ecd2822746fd5dc110b1636bf
--- 1/src/crimson/os/seastore/transaction_manager.cc
--- 2/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@@ -445,10 -383,10 +440,8 @@@ TransactionManager::do_submit_transacti
        });
      }).handle_error(
        submit_transaction_iertr::pass_further{},
-       crimson::ct_error::all_same_way([](auto e) {
-       ceph_assert(0 == "Hit error submitting to journal");
-       })
+       crimson::ct_error::assert_all{"Hit error submitting to journal"}
      );
 -  }).finally([&tref]() {
 -      tref.get_handle().exit();
    });
  }
  

diff --cc src/crimson/osd/osd.cc
Simple merge

diff --cc src/crimson/osd/osd_meta.cc
Simple merge

diff --cc src/crimson/osd/osd_operations/scrub_events.cc
Simple merge

diff --cc src/crimson/osd/replicated_recovery_backend.cc
Simple merge

diff --cc src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
Simple merge

diff --cc src/test/crimson/seastore/test_btree_lba_manager.cc
Simple merge

diff --cc src/test/crimson/seastore/test_seastore.cc
Simple merge

diff --cc src/test/crimson/seastore/test_seastore_cache.cc
Simple merge