From e3de7c0941803ba8ee318bc2d5bea5d3b1f765a3 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Sun, 5 Nov 2023 09:31:05 +0000 Subject: [PATCH] crimson/osd/pg: add logs around submit_error_log() Signed-off-by: Matan Breizman --- src/crimson/osd/osd_operations/client_request.cc | 3 +++ src/crimson/osd/pg.cc | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc index d208e2e53d9..2160e4823f7 100644 --- a/src/crimson/osd/osd_operations/client_request.cc +++ b/src/crimson/osd/osd_operations/client_request.cc @@ -346,10 +346,13 @@ ClientRequest::do_process( } return pg->do_osd_ops(m, conn, obc, op_info, snapc).safe_then_unpack_interruptible( [this, pg, &ihref](auto submitted, auto all_completed) mutable { + logger().debug("do_process::{} in submitted", *this); return submitted.then_interruptible([this, pg, &ihref] { + logger().debug("do_process::{} in enter_stage wait_repop", *this); return ihref.enter_stage(client_pp(*pg).wait_repop, *this); }).then_interruptible( [this, pg, all_completed=std::move(all_completed), &ihref]() mutable { + logger().debug("do_process::{} in all_completed", *this); return all_completed.safe_then_interruptible( [this, pg, &ihref](MURef reply) { return ihref.enter_stage(client_pp(*pg).send_reply, *this diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 84a944533b9..b74da374ad7 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -923,6 +923,7 @@ PG::do_osd_ops_execute( ); })); } + seastar::future<> PG::submit_error_log( Ref m, const OpInfo &op_info, @@ -931,6 +932,8 @@ seastar::future<> PG::submit_error_log( ceph_tid_t rep_tid, eversion_t &version) { + logger().debug("{}: {} rep_tid: {} error: {}", + __func__, *m, rep_tid, e); const osd_reqid_t &reqid = m->get_reqid(); mempool::osd_pglog::list log_entries; log_entries.push_back(pg_log_entry_t(pg_log_entry_t::ERROR, @@ -967,10 +970,14 @@ seastar::future<> PG::submit_error_log( rep_tid, peering_state.get_pg_trim_to(), peering_state.get_min_last_complete_ondisk()); + logger().debug("submit_error_log: sending log" + "missing_request (rep_tid: {} entries: {})" + " to osd {}", rep_tid, log_entries, peer.osd); send_cluster_message(peer.osd, std::move(log_m), get_osdmap_epoch()); waiting_on.insert(peer); } waiting_on.insert(pg_whoami); + logger().debug("submit_error_log: inserting rep_tid {}", rep_tid); log_entry_update_waiting_on.insert( std::make_pair(rep_tid, log_update_t{std::move(waiting_on)})); return shard_services.get_store().do_transaction( @@ -1038,6 +1045,7 @@ PG::do_osd_ops( // failure_func [m, &op_info, obc, this] (const std::error_code& e) { return seastar::do_with(eversion_t(), [m, &op_info, obc, e, this](auto &version) { + logger().error("do_osd_ops_execute::failure_func {} got error: {}", *m, e); auto error_log_fut = seastar::now(); epoch_t epoch = get_osdmap_epoch(); ceph_tid_t rep_tid = shard_services.get_tid(); -- 2.39.5