Merge pull request #20081 from dzafman/wip-recovering-luminous

luminous: osd/ReplicatedPG.cc: recover_replicas: object added to missing set for backfill, but is not in recovering, error!

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/mon/PGMap.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.h
Simple merge