From 9f160e4f1aa385f39f1cd55eb42f278c94dfd85c Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 11 Apr 2023 10:49:09 -0400 Subject: [PATCH] rgw/aio: fix recursion from tracing changes Fixes: https://tracker.ceph.com/issues/59423 Signed-off-by: Casey Bodley --- src/rgw/rgw_aio.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_aio.cc b/src/rgw/rgw_aio.cc index c90841dbb7b0c..7e1b6a92c3f10 100644 --- a/src/rgw/rgw_aio.cc +++ b/src/rgw/rgw_aio.cc @@ -58,7 +58,7 @@ Aio::OpFunc aio_abstract(librados::IoCtx ctx, Op&& op, jspan_context* trace_ctx (void)trace_ctx; // suppress unused trace_ctx warning. until we will support the read op trace r.result = ctx.aio_operate(r.obj.oid, s->c, &op, &r.data); } else { - r.result = ctx.aio_operate(r.obj.oid, s->c, &op, trace_ctx); + r.result = ctx.aio_operate(r.obj.oid, s->c, &op, 0, trace_ctx); } if (r.result < 0) { // cb() won't be called, so release everything here @@ -123,7 +123,7 @@ Aio::OpFunc aio_abstract(librados::IoCtx ctx, Op&& op, optional_yield y, jspan_c return aio_abstract(std::move(ctx), std::forward(op), y.get_io_context(), y.get_yield_context(), trace_ctx); } - return aio_abstract(std::move(ctx), std::forward(op), null_yield, trace_ctx); + return aio_abstract(std::move(ctx), std::forward(op), trace_ctx); } } // anonymous namespace -- 2.39.5