]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
crimson/osd: add_recovery(oid) before recover_object(oid)
authorKefu Chai <kchai@redhat.com>
Wed, 23 Sep 2020 04:14:36 +0000 (12:14 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 23 Sep 2020 04:20:16 +0000 (12:20 +0800)
commit35d37e2bff7976b6a1d4cb2af8ad3abad0e2045f
tree42b51f7c76738a0dc02c986bd2ceb2c5505bc645
parent6cbc51db4eecdf759e7b9c7def06e0a7821ba0a1
crimson/osd: add_recovery(oid) before recover_object(oid)

in 7736bddc534e5df2daf704c4bbc92a0927b0db4d, we assumed that the object
to be recovered did not exist in `recovering` before
`recover_object(oid)` was called. but this turns out not true. so, in
this change, `add_object(oid)` is called before `recover_object(oid)`
gets called.

Fixes: https://tracker.ceph.com/issues/47593
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/pg_recovery.cc
src/crimson/osd/replicated_recovery_backend.cc