Merge pull request #21101 from dzafman/wip-23267

scrub errors not cleared on replicas can cause inconsistent pg state when replica takes over primary

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

diff --cc src/ceph_osd.cc
Simple merge

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

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