Merge PR #38909 into master

* refs/pull/38909/head:
	PendingReleaseNotes: document option osd_fast_shutdown_notify_mon
	osd: add osd_fast_shutdown_notify_mon option (default false)

Reviewed-by: Neha Ojha <nojha@redhat.com>

diff --cc PendingReleaseNotes
index 57586d3c61304d77967b7b8bb6ce56f9b30b8984,15f3a8956270c9aa388244c43508bb24093a1276..0b7d0cdba557c267d5130554fd9921b4ea50ab64
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -69,16 -60,18 +69,21 @@@
    exposed by the ceph-mgr:
    https://docs.ceph.com/en/latest/cephfs/fs-volumes/
  
 -* An AWS-compliant API: "GetTopicAttributes" was added to replace the existing "GetTopic" API. The new API
 -  should be used to fetch information about topics used for bucket notifications.
 +* An AWS-compliant API: "GetTopicAttributes" was added to replace the existing 
 +  "GetTopic" API. The new API should be used to fetch information about topics 
 +  used for bucket notifications.
  
 -* librbd: The shared, read-only parent cache's config option ``immutable_object_cache_watermark`` now has been updated
 -  to property reflect the upper cache utilization before space is reclaimed. The default ``immutable_object_cache_watermark``
 -  now is ``0.9``. If the capacity reaches 90% the daemon will delete cold cache.
 +* librbd: The shared, read-only parent cache's config option 
 +  ``immutable_object_cache_watermark`` has now been updated to properly reflect 
 +  the upper cache utilization before space is reclaimed. The default 
 +  ``immutable_object_cache_watermark`` is now ``0.9``. If the capacity reaches 
 +  90% the daemon will delete cold cache.
  
+ * OSD: the option ``osd_fast_shutdown_notify_mon`` has been introduced to allow
+   the OSD to notify the monitor it is shutting down even if ``osd_fast_shutdown``
+   is enabled. This helps with the monitor logs on larger clusters, that may get
+   many 'osd.X reported immediately failed by osd.Y' messages, and confuse tools.
+ 
  >=15.0.0
  --------
  

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

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