From: Omri Zeneva Date: Thu, 20 Jan 2022 09:03:53 +0000 (-0500) Subject: osd: remove unused tracing spans X-Git-Tag: v18.0.0~789^2~11 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=24ba2e18a75c2d9ea42c8faf18d3531597b46fc4;p=ceph-ci.git osd: remove unused tracing spans Signed-off-by: Omri Zeneva --- diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 06c75049f22..2b350858f23 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -951,7 +951,6 @@ void ECBackend::handle_sub_write( jspan span; if (msg) { msg->mark_event("sub_op_started"); - span = tracing::osd::tracer.add_span(__func__, msg->osd_parent_span); } trace.event("handle_sub_write"); @@ -1553,7 +1552,6 @@ void ECBackend::submit_transaction( jspan span; if (client_op) { op->trace = client_op->pg_trace; - span = tracing::osd::tracer.add_span("ECBackend::submit_transaction", client_op->osd_parent_span); } dout(10) << __func__ << ": op " << *op << " starting" << dendl; start_rmw(op, std::move(t)); @@ -2126,10 +2124,6 @@ bool ECBackend::try_reads_to_commit() messages.push_back(std::make_pair(i->osd, r)); } } - jspan span; - if (op->client_op) { - span = tracing::osd::tracer.add_span("EC sub write", op->client_op->osd_parent_span); - } if (!messages.empty()) { get_parent()->send_message_osd_cluster(messages, get_osdmap_epoch()); diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index ef55e440b06..51c07df2511 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -7276,7 +7276,6 @@ void OSD::dispatch_session_waiting(const ceph::ref_t& session, OSDMapRe void OSD::ms_fast_dispatch(Message *m) { - auto dispatch_span = tracing::osd::tracer.start_trace(__func__); FUNCTRACE(cct); if (service.is_stopping()) { m->put(); @@ -7332,7 +7331,7 @@ void OSD::ms_fast_dispatch(Message *m) tracepoint(osd, ms_fast_dispatch, reqid.name._type, reqid.name._num, reqid.tid, reqid.inc); } - op->osd_parent_span = tracing::osd::tracer.add_span("op-request-created", dispatch_span); + op->osd_parent_span = tracing::osd::tracer.start_trace("op-request-created"); if (m->trace) op->osd_trace.init("osd op", &trace_endpoint, &m->trace); diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 1b60dfc0793..58a065f96dc 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -1796,7 +1796,6 @@ void PrimaryLogPG::do_request( op->pg_trace.event("do request"); } - [[maybe_unused]] auto span = tracing::osd::tracer.add_span(__func__, op->osd_parent_span); // make sure we have a new enough map auto p = waiting_for_map.find(op->get_source()); @@ -2169,7 +2168,6 @@ void PrimaryLogPG::do_op(OpRequestRef& op) << " flags " << ceph_osd_flag_string(m->get_flags()) << dendl; - [[maybe_unused]] auto span = tracing::osd::tracer.add_span(__func__, op->osd_parent_span); // missing object? if (is_unreadable_object(head)) { @@ -4188,7 +4186,6 @@ void PrimaryLogPG::execute_ctx(OpContext *ctx) reqid.name._num, reqid.tid, reqid.inc); } - [[maybe_unused]] auto span = tracing::osd::tracer.add_span(__func__, ctx->op->osd_parent_span); int result = prepare_transaction(ctx); @@ -5966,10 +5963,6 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) dout(10) << "do_osd_op " << soid << " " << ops << dendl; - jspan span; - if (ctx->op) { - span = tracing::osd::tracer.add_span(__func__, ctx->op->osd_parent_span); - } ctx->current_osd_subop_num = 0; for (auto p = ops.begin(); p != ops.end(); ++p, ctx->current_osd_subop_num++, ctx->processed_subop_count++) { OSDOp& osd_op = *p; @@ -8924,10 +8917,6 @@ void PrimaryLogPG::finish_ctx(OpContext *ctx, int log_op_type, int result) << dendl; utime_t now = ceph_clock_now(); - jspan span; - if (ctx->op) { - span = tracing::osd::tracer.add_span(__func__, ctx->op->osd_parent_span); - } // Drop the reference if deduped chunk is modified if (ctx->new_obs.oi.is_dirty() && @@ -11314,10 +11303,6 @@ void PrimaryLogPG::op_applied(const eversion_t &applied_version) void PrimaryLogPG::eval_repop(RepGather *repop) { - jspan span; - if (repop->op) { - span = tracing::osd::tracer.add_span(__func__, repop->op->osd_parent_span); - } dout(10) << "eval_repop " << *repop << (repop->op && repop->op->get_req() ? "" : " (no op)") << dendl; @@ -11373,10 +11358,6 @@ void PrimaryLogPG::issue_repop(RepGather *repop, OpContext *ctx) << " o " << soid << dendl; - jspan span; - if (ctx->op) { - span = tracing::osd::tracer.add_span(__func__, ctx->op->osd_parent_span); - } repop->v = ctx->at_version; diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 50a6c60d7f0..22bf4aea0f5 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -504,10 +504,6 @@ void ReplicatedBackend::submit_transaction( ceph_assert(insert_res.second); InProgressOp &op = *insert_res.first->second; - jspan span; - if (orig_op) { - span = tracing::osd::tracer.add_span("ReplicatedBackend::submit_transaction", orig_op->osd_parent_span); - } op.waiting_for_commit.insert( parent->get_acting_recovery_backfill_shards().begin(), @@ -1062,10 +1058,6 @@ void ReplicatedBackend::do_repop(OpRequestRef op) << " " << m->logbl.length() << dendl; - jspan span; - if (op) { - span = tracing::osd::tracer.add_span(__func__, op->osd_parent_span); - } // sanity checks ceph_assert(m->map_epoch >= get_info().history.same_interval_since); diff --git a/src/osd/scheduler/OpSchedulerItem.cc b/src/osd/scheduler/OpSchedulerItem.cc index 9f834e90778..194e17f301c 100644 --- a/src/osd/scheduler/OpSchedulerItem.cc +++ b/src/osd/scheduler/OpSchedulerItem.cc @@ -30,7 +30,6 @@ void PGOpItem::run( PGRef& pg, ThreadPool::TPHandle &handle) { - [[maybe_unused]] auto span = tracing::osd::tracer.add_span("PGOpItem::run", op->osd_parent_span); osd->dequeue_op(pg, op, handle); pg->unlock(); }