Skip to content

Commit

Permalink
crimson/osd/ops_executer: pass MutFunc by value
Browse files Browse the repository at this point in the history
Since we now co_await mut_func, we should not pass it by rvalue ref.

```
DEBUG 2024-09-01 15:54:46,212 [shard 0:main] osd - do_osd_ops_execute: object 2:c4c92e5a:::rbd_trash:head submitting txn
=================================================================
==17416==ERROR: AddressSanitizer: stack-use-after-return on address 0x7f590008a430 at pc 0x0000040a367a bp 0x7ffc0b1d5ff0 sp 0x7ffc0b1d5fe0
Address 0x7f590008a430 is located in stack of thread T0 at offset 48 in frame
    #0 0x40b0a2b in crimson::osd::PG::do_osd_ops_execute ... lambda(std::error_code const&)#1}&&)::{lambda()#1}::operator()() const (/usr/bin/ceph-osd+0x40b0a2b)
```

Co-authored-by: Xuehan Xu <[email protected]>
Signed-off-by: Matan Breizman <[email protected]>
  • Loading branch information
Matan-B and xxhdx1985126 committed Sep 9, 2024
1 parent ea89f46 commit 0d37bc9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/crimson/osd/ops_executer.h
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ class OpsExecuter : public seastar::enable_lw_shared_from_this<OpsExecuter> {
const std::vector<OSDOp>& ops,
SnapMapper& snap_mapper,
OSDriver& osdriver,
MutFunc&& mut_func) &&;
MutFunc mut_func) &&;
std::vector<pg_log_entry_t> prepare_transaction(
const std::vector<OSDOp>& ops);
void fill_op_params(modified_by m);
Expand Down Expand Up @@ -513,7 +513,7 @@ OpsExecuter::flush_changes_n_do_ops_effects(
const std::vector<OSDOp>& ops,
SnapMapper& snap_mapper,
OSDriver& osdriver,
MutFunc&& mut_func) &&
MutFunc mut_func) &&
{
const bool want_mutate = !txn.empty();
// osd_op_params are instantiated by every wr-like operation.
Expand Down

0 comments on commit 0d37bc9

Please sign in to comment.