From: Sage Weil Date: Thu, 12 Sep 2019 14:57:12 +0000 (-0500) Subject: Merge PR #29820 into master X-Git-Tag: v15.1.0~1584 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=991520b869c8add52c34ab2420da827e76f3e795;p=ceph.git 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 --- 991520b869c8add52c34ab2420da827e76f3e795