From: Yingxin <yingxin.cheng@intel.com>
Date: Thu, 16 May 2024 07:57:48 +0000 (+0800)
Subject: Merge pull request #55735 from xxhdx1985126/wip-crimson-errorator-void-handler
X-Git-Tag: v20.0.0~1925
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d50b94f93f6f94a8bccca88a5bf796efdb18e9d8;p=ceph.git

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>
---

d50b94f93f6f94a8bccca88a5bf796efdb18e9d8
diff --cc src/crimson/os/seastore/seastore.h
index 75dbaf54f35b5,675fe359ffe02..3de8a812e1291
--- a/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 829237755a288,234afb674c1d7..654ddc7c6d2ed
--- a/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();
    });
  }