]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd/PeeringState: do not exclude up from acting_recovery_backfill
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 20 Nov 2019 00:31:54 +0000 (08:31 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 14 Feb 2020 12:39:50 +0000 (13:39 +0100)
commit4df29d4633f8a4817b4cb05aa60923cf54aee5a3
treee90687011cb5dbaba3c9cb39e261ba12c6c1c87f
parentd960563efabca8f69d3fdc34444e49bced5a65e8
osd/PeeringState: do not exclude up from acting_recovery_backfill

If we choose a primary that does not belong to the current up set,
and all up peers are still recoverable, then we might end up excluding
some up peer from the acting_recovery_backfill set too due to the
"want size <= pool size" constraint (since https://github.com/ceph/ceph/pull/24035),
as a result of which all up peers might not get recovered in one go.

Fix by falling through any oversized want set to async recovery, which
should be able to handle it nicely.

Fixes: https://tracker.ceph.com/issues/42577
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 22c8cdad8ee1d7376c7d200bdb6ec94ed6d3b5e6)

Conflicts:
src/osd/PeeringState.cc
- file does not exist in mimic; made the change manually to
  src/osd/PG.cc
src/osd/PG.cc