95fbe5577c
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>
43 lines
1019 B
Smarty
43 lines
1019 B
Smarty
#!/bin/bash
|
|
|
|
{{/*
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
set -ex
|
|
export LC_ALL=C
|
|
|
|
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)
|
|
if [ $? = 0 ]; then
|
|
exit 0
|
|
else
|
|
echo $MGR_STATE
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
function liveness () {
|
|
heath_check
|
|
}
|
|
|
|
function readiness () {
|
|
heath_check
|
|
}
|
|
|
|
$COMMAND
|