From: David Zafman Date: Tue, 10 Nov 2020 22:29:08 +0000 (-0800) Subject: doc: Apply suggestions from code review X-Git-Tag: v17.0.0~666^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e469f5b314bfb0767f71df029eaaeab08750104;p=ceph-ci.git doc: Apply suggestions from code review Co-authored-by: Neha Ojha Co-authored-by: Josh Durgin Signed-off-by: David Zafman --- diff --git a/PendingReleaseNotes b/PendingReleaseNotes index b900e2b5000..0fc5579e8e5 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -22,14 +22,14 @@ ``osd_scrub_end_week_day`` are 0 - 6. The use of 7 is now illegal. Specifying ``0`` for both values causes every day of the week to be allowed. -* A new health check will warn if different versions of Ceph are running - on deamons. It will be a health error if multiple versions are detected. - This condition must exists for over 1 week by default in order for the +* A new health check, DAEMON_OLD_VERSION, will warn if different versions of Ceph are running + on daemons. It will generate a health error if multiple versions are detected. + This condition must exist for over mon_warn_older_version_delay (set to 1 week by default) in order for the health condition to be triggered. This allows most upgrades to proceed - without falsely see the warning. If upgrade is paused for an extended + without falsely seeing the warning. If upgrade is paused for an extended time period, health mute can be used like this "ceph health mute DAEMON_OLD_VERSION --sticky". In this case after - upgrading has finish use "ceph health unmute DAEMON_OLD_VERSION". + upgrade has finished use "ceph health unmute DAEMON_OLD_VERSION". >=15.0.0 -------- diff --git a/doc/rados/operations/health-checks.rst b/doc/rados/operations/health-checks.rst index 65aeedd5df3..90fb9b5a1e2 100644 --- a/doc/rados/operations/health-checks.rst +++ b/doc/rados/operations/health-checks.rst @@ -28,14 +28,14 @@ Monitor DAEMON_OLD_VERSION __________________ -Warn if old version(s) of Ceph are running on any deamons. -It will be a health error if multiple versions are detected. -This condition must exists for over 1 week by default in order for the +Warn if old version(s) of Ceph are running on any daemons. +It will generate a health error if multiple versions are detected. +This condition must exist for over mon_warn_older_version_delay (set to 1 week by default) in order for the health condition to be triggered. This allows most upgrades to proceed -without falsely see the warning. If upgrade is paused for an extended +without falsely seeing the warning. If upgrade is paused for an extended time period, health mute can be used like this "ceph health mute DAEMON_OLD_VERSION --sticky". In this case after -upgrading has finish use "ceph health unmute DAEMON_OLD_VERSION". +upgrade has finished use "ceph health unmute DAEMON_OLD_VERSION". MON_DOWN ________