openstack/openstack-helm
Code Issues Proposed changes

[ceph-mgr] Remove grep from the ceph-mgr health check function

Browse Source 
Ceph 19.2.3 replaces the handler for the ceph-mgr asok status query
with a new handler that simply returns an empty dictionary and a
success code. The ceph-mgr readiness/liveness probe health check
function currently relies on content from the returned dictionary
to succeed. This change simply removes that content check and
relies solely on the return code of the status query instead.

This change to the ceph-mgr probes retains backward compatiblity
with previous Ceph versions as well.

Change-Id: Iffa1764735733a2b2ef16c5cba6c9880d03b357b
Signed-off-by: Stephen Taylor <stephen.taylor.1@att.com>
This commit is contained in:
Stephen Taylor
2025-08-07 09:53:09 -06:00
parent ab29d9f064
commit 95fbe5577c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-mon/templates/bin/mgr/_check.sh.tpl
View File

@@ -22,7 +22,7 @@ COMMAND="${@:-liveness}"
function heath_check () {
ASOK=$(ls /var/run/ceph/${CLUSTER}-mgr*)
MGR_NAME=$(basename ${ASOK} | sed -e 's/.asok//' | cut -f 1 -d '.' --complement)
MGR_STATE=$(ceph --cluster ${CLUSTER} --connect-timeout 1 daemon mgr.${MGR_NAME} status|grep "osd_epoch")
MGR_STATE=$(ceph --cluster ${CLUSTER} --connect-timeout 1 daemon mgr.${MGR_NAME} status)
if [ $? = 0 ]; then
exit 0
else

6
releasenotes/notes/ceph-mon-5ece5f0b0f571966.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
ceph-mon:
- |
Upgrade Ceph to 19.2.3 and adjust the ceph-mgr liveness probe to account
for a new asok status query handler that returns an empty dictionary.
...