Merge PR #24064 into master

* refs/pull/24064/head:
	osd: simplify init of fabricated pg
	osd/PG: inherit pg history from merge source, if necessary
	osd/osd_types: increasing pg_num_pending is also an interval change
	osd: cancel pg merge if PGs are undersized
	mon/OSDMonitor: handle ready_to_merge message that cancels the merge
	osd/PG: only signal ready_to_merge if we have all replicas
	osd/PG: move all mark_clean-ish activity into try_mark_clean()
	osd/PG: use last_epoch_clean from ReadyToMerge point in time for fabricated history
	osd: send last_epoch_clean when indicating PG is ready to merge
	osd/osd_types: rename pg_num_pending_dec_epoch -> pg_num_dec_last_epoch_clean
	osd,mon: stop setting pg_num_pending_dec_epoch

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

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

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

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

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

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

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