]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: fix assertion failure in InternalClientRequest. 44184/head
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 1 Dec 2021 18:35:36 +0000 (18:35 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 2 Dec 2021 11:16:36 +0000 (11:16 +0000)
```
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 <rzarzyns@redhat.com>
src/crimson/osd/osd_operations/internal_client_request.cc

index 8b15005ef3d20318e302ae957f2950ee9d2c30d0..b4b61ea66f67d587f866a6dad300445dde3c71b9 100644 (file)
@@ -52,7 +52,7 @@ seastar::future<> InternalClientRequest::start()
           return with_blocking_future_interruptible<interruptor::condition>(
             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<interruptor::condition>(
               handle.enter(pp().get_obc)