RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson: unify error handling paths in PG::do_osd_ops().

Browse Source 
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Radoslaw Zarzynski 2020-11-20 15:20:42 +01:00
parent 7d691a0388
commit 61ca0c1271
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -612,6 +612,26 @@ osd_op_params_t&& PG::fill_op_params_bump_pg_version(
return std::move(osd_op_p);
}
seastar::future<Ref<MOSDOpReply>> PG::handle_failed_op(
const std::error_code& e,
ObjectContextRef obc,
const MOSDOp& m) const
{
assert(e.value() > 0);
logger().debug(
"{}: {} - object {} got error code {}, {}",
__func__,
m,
obc->obs.oi.soid,
e.value(),
e.message());
auto reply = make_message<MOSDOpReply>(
&m, -e.value(), get_osdmap_epoch(), 0, false);
reply->set_enoent_reply_versions(peering_state.get_info().last_update,
peering_state.get_info().last_user_version);
return seastar::make_ready_future<Ref<MOSDOpReply>>(std::move(reply));
}
seastar::future<Ref<MOSDOpReply>> PG::do_osd_ops(
Ref<MOSDOp> m,
ObjectContextRef obc,
@ -689,31 +709,11 @@ seastar::future<Ref<MOSDOpReply>> PG::do_osd_ops(
obc->obs.oi.soid);
return seastar::make_ready_future<Ref<MOSDOpReply>>(std::move(reply));
}, OpsExecuter::osd_op_errorator::all_same_way([=] (const std::error_code& e) {
assert(e.value() > 0);
logger().debug(
"do_osd_ops: {} - object {} got error code {}, {}",
*m,
obc->obs.oi.soid,
e.value(),
e.message());
auto reply = make_message<MOSDOpReply>(
m.get(), -e.value(), get_osdmap_epoch(), 0, false);
reply->set_enoent_reply_versions(peering_state.get_info().last_update,
peering_state.get_info().last_user_version);
return seastar::make_ready_future<Ref<MOSDOpReply>>(std::move(reply));
return handle_failed_op(e, obc, *m);
})).handle_exception_type([=](const crimson::osd::error& e) {
// we need this handler because throwing path which aren't errorated yet.
logger().debug(
"do_osd_ops: {} - object {} got unhandled exception {} ({})",
*m,
obc->obs.oi.soid,
e.code(),
e.what());
auto reply = make_message<MOSDOpReply>(
m.get(), -e.code().value(), get_osdmap_epoch(), 0, false);
reply->set_enoent_reply_versions(peering_state.get_info().last_update,
peering_state.get_info().last_user_version);
return seastar::make_ready_future<Ref<MOSDOpReply>>(std::move(reply));
logger().debug("encountered the legacy error handling path!");
return handle_failed_op(e.code(), obc, *m);
});
}

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

@ -535,6 +535,10 @@ private:
osd_op_params_t&& osd_op_p,
Ref<MOSDOp> m,
const bool user_modify);
seastar::future<Ref<MOSDOpReply>> handle_failed_op(
const std::error_code& e,
ObjectContextRef obc,
const MOSDOp& m) const;
seastar::future<Ref<MOSDOpReply>> do_osd_ops(
Ref<MOSDOp> m,
ObjectContextRef obc,