From 43e36773a22550cd8f56d9332df761584609d29f Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 1 Dec 2021 18:35:36 +0000 Subject: [PATCH] crimson/osd: fix assertion failure in InternalClientRequest. ``` DEBUG 2021-12-01 07:55:10,541 [shard 0] osd - internal_client_request(id=1, detail=): in repeat TRACE 2021-12-01 07:55:10,541 [shard 0] osd - with_interruption_cond: interrupt_cond: 0x0 TRACE 2021-12-01 07:55:10,541 [shard 0] osd - call_with_interruption_impl: may_interrupt: false, local interrupt_condintion: 0x603000b5d270, global interrupt_cond: 0x0,N7crimson3osd20IOInterruptConditionE TRACE 2021-12-01 07:55:10,541 [shard 0] osd - set: interrupt_cond: 0x603000b5d270, ref_count: 1 TRACE 2021-12-01 07:55:10,541 [shard 0] osd - call_with_interruption_impl clearing interrupt_cond: 0x603000b5d270,N7crimson3osd20IOInterruptConditionE TRACE 2021-12-01 07:55:10,541 [shard 0] osd - call_with_interruption_impl: may_interrupt: false, local interrupt_condintion: 0x603000b5d270, global interrupt_cond: 0x0,N7crimson3osd20IOInterruptConditionE TRACE 2021-12-01 07:55:10,541 [shard 0] osd - set: interrupt_cond: 0x603000b5d270, ref_count: 1 TRACE 2021-12-01 07:55:10,541 [shard 0] osd - call_with_interruption_impl clearing interrupt_cond: 0x603000b5d270,N7crimson3osd20IOInterruptConditionE TRACE 2021-12-01 07:55:10,541 [shard 0] osd - call_with_interruption_impl: may_interrupt: false, local interrupt_condintion: 0x603000b5d270, global interrupt_cond: 0x0,N7crimson3osd20IOInterruptConditionE TRACE 2021-12-01 07:55:10,541 [shard 0] osd - set: interrupt_cond: 0x603000b5d270, ref_count: 1 TRACE 2021-12-01 07:55:10,541 [shard 0] osd - call_with_interruption_impl clearing interrupt_cond: 0x603000b5d270,N7crimson3osd20IOInterruptConditionE TRACE 2021-12-01 07:55:10,542 [shard 0] osd - call_with_interruption_impl: may_interrupt: false, local interrupt_condintion: 0x603000b5d270, global interrupt_cond: 0x0,N7crimson3osd20IOInterruptConditionE TRACE 2021-12-01 07:55:10,542 [shard 0] osd - set: interrupt_cond: 0x603000b5d270, ref_count: 1 DEBUG 2021-12-01 07:55:10,542 [shard 0] osd - do_recover_missing check for recovery, MIN ERROR 2021-12-01 07:55:10,542 [shard 0] none - /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-8902-g52fd47fe/rpm/el8/BUILD/ceph-17.0.0-8902-g52fd47fe/src/crimson/osd/pg.cc:1195 : In function 'bool crimson::osd::PG::is_degraded_or_backfilling_object(const hobject_t&) const', ceph_assert(%s) !get_acting_recovery_backfill().empty() ``` Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/osd_operations/internal_client_request.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crimson/osd/osd_operations/internal_client_request.cc b/src/crimson/osd/osd_operations/internal_client_request.cc index 8b15005ef3d20..b4b61ea66f67d 100644 --- a/src/crimson/osd/osd_operations/internal_client_request.cc +++ b/src/crimson/osd/osd_operations/internal_client_request.cc @@ -52,7 +52,7 @@ seastar::future<> InternalClientRequest::start() return with_blocking_future_interruptible( handle.enter(pp().recover_missing) ).then_interruptible([this] { - return do_recover_missing(pg, {}); + return do_recover_missing(pg, get_target_oid()); }).then_interruptible([this] { return with_blocking_future_interruptible( handle.enter(pp().get_obc) -- 2.39.5