// created for us by `seastar::async` in `::do_op_call()`.
int ret = 0;
using osd_op_errorator = crimson::osd::OpsExecuter::osd_op_errorator;
- reinterpret_cast<crimson::osd::OpsExecuter*>(hctx)->execute_osd_op(op).handle_error(
+ reinterpret_cast<crimson::osd::OpsExecuter*>(hctx)->execute_op(op).handle_error(
osd_op_errorator::all_same_way([&ret] (const std::error_code& err) {
assert(err.value() > 0);
ret = -err.value();
}
OpsExecuter::osd_op_errorator::future<>
-OpsExecuter::execute_osd_op(OSDOp& osd_op)
+OpsExecuter::execute_op(OSDOp& osd_op)
{
// TODO: dispatch via call table?
// TODO: we might want to find a way to unify both input and output
}
seastar::future<>
-PgOpsExecuter::execute_pg_op(OSDOp& osd_op)
+PgOpsExecuter::execute_op(OSDOp& osd_op)
{
logger().warn("handling op {}", ceph_osd_op_name(osd_op.op.op));
switch (const ceph_osd_op& op = osd_op.op; op.op) {
msg(std::move(msg)) {
}
- osd_op_errorator::future<> execute_osd_op(class OSDOp& osd_op);
+ osd_op_errorator::future<> execute_op(class OSDOp& osd_op);
template <typename Func, typename MutFunc>
osd_op_errorator::future<> flush_changes(Func&& func, MutFunc&& mut_func) &&;
: pg(pg), nspace(msg.get_hobj().nspace) {
}
- seastar::future<> execute_pg_op(class OSDOp& osd_op);
+ seastar::future<> execute_op(class OSDOp& osd_op);
private:
const PG& pg;
*m,
obc->obs.oi.soid,
ceph_osd_op_name(osd_op.op.op));
- return ox->execute_osd_op(osd_op);
+ return ox->execute_op(osd_op);
}).safe_then([this, obc, m, ox = ox.get(), &op_info] {
logger().debug(
"do_osd_ops: {} - object {} all operations successful",
std::as_const(*m));
return seastar::do_for_each(m->ops, [ox = ox.get()](OSDOp& osd_op) {
logger().debug("will be handling pg op {}", ceph_osd_op_name(osd_op.op.op));
- return ox->execute_pg_op(osd_op);
+ return ox->execute_op(osd_op);
}).then([m, this, ox = std::move(ox)] {
auto reply = make_message<MOSDOpReply>(m.get(), 0, get_osdmap_epoch(),
CEPH_OSD_FLAG_ACK | CEPH_OSD_FLAG_ONDISK,