RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: do not move op_params_p in fill_op_params_bump_pg_version()

Browse Source 
it's confusing to move the parameter for updating it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-02-07 14:46:12 +08:00
parent 9eca9243f4
commit c6dd356e4c
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/crimson/osd/pg.cc
View File

@ -620,8 +620,8 @@ seastar::future<> PG::submit_transaction(const OpInfo& op_info,
});
}
osd_op_params_t&& PG::fill_op_params_bump_pg_version(
osd_op_params_t&& osd_op_p,
void PG::fill_op_params_bump_pg_version(
osd_op_params_t& osd_op_p,
Ref<MOSDOp> m,
const bool user_modify)
{
@ -633,7 +633,6 @@ osd_op_params_t&& PG::fill_op_params_bump_pg_version(
if (user_modify) {
osd_op_p.user_at_version = osd_op_p.at_version.version;
}
return std::move(osd_op_p);
}
seastar::future<Ref<MOSDOpReply>> PG::handle_failed_op(
@ -736,16 +735,13 @@ PG::do_osd_ops(
"do_osd_ops: {} - object {} submitting txn",
*m,
obc->obs.oi.soid);
auto filled_osd_op_p = fill_op_params_bump_pg_version(
std::move(osd_op_p),
std::move(m),
user_modify);
fill_op_params_bump_pg_version(osd_op_p, std::move(m), user_modify);
return submit_transaction(
op_info,
filled_osd_op_p.req->ops,
osd_op_p.req->ops,
std::move(obc),
std::move(txn),
std::move(filled_osd_op_p));
std::move(osd_op_p));
});
}).safe_then([this, m, obc, rvec = op_info.allows_returnvec()] {
// TODO: should stop at the first op which returns a negative retval,

4
src/crimson/osd/pg.h
View File

@ -518,8 +518,8 @@ private:
void do_peering_event(
const boost::statechart::event_base &evt,
PeeringCtx &rctx);
osd_op_params_t&& fill_op_params_bump_pg_version(
osd_op_params_t&& osd_op_p,
void fill_op_params_bump_pg_version(
osd_op_params_t& osd_op_p,
Ref<MOSDOp> m,
const bool user_modify);
seastar::future<Ref<MOSDOpReply>> handle_failed_op(