Merge PR #29820 into master

* refs/pull/29820/head:
	osd/PeeringState: log_weirdness during peering
	osd/PeeringState: send new message types
	osd/PeeringState: give require_osd_release to BufferedRecoveryMessages
	osd: add new notify, query, and info messages
	osd/PeeringState: use send_info() for replica activation ack
	osd/PeeringState: remove old info_map member
	osd/PeeringState: send infos via message_map (not info_map)
	osd/PeeringState: remove old query_map member
	osd/PeeringState: send queries via message_map (not query_map)
	osd/PeeringState: use return value from discover_all_missing
	osd/PeeringState: give PeeringCtxWrapper a BufferedRecoveryMessages ref
	osd/PeeringState: send notifies via message_map (not notify_list)
	osd/PeeringState: add message_map to PeeringCtx/BufferedRecoveryMessages
	osd: dispatch_context inside PG lock

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/msg/Message.cc
Simple merge

diff --cc src/msg/Message.h
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