Merge "Check that ceph-mon service has started to get its version"

Code Issues Proposed changes

This commit is contained in:

Zuul

2020年05月04日 19:18:24 +00:00

committed by Gerrit Code Review

parent 1d4c5bee21 a97b1449cd

commit 71317476aa

1 changed files with 12 additions and 4 deletions

@@ -226,15 +226,23 @@ function is_ceph_enabled_for_service {

# and healthy.

function _get_ceph_version {

local ceph_version_str

local mon_started

if [[ 1ドル == 'cli' ]]; then

# ceph --version show CLI version

ceph_version_str=$(sudo ceph --version | cut -d ' ' -f 3 | \

cut -d '.' -f 1,2)

elif [[ 1ドル == 'mon' ]]; then

# TODO(frickler): Find a better way to make sure that ceph-mon has started

sleep 5

ceph_version_str=$(sudo ceph daemon mon.$(hostname) version | \

cut -d '"' -f 4 | cut -f 1,2 -d '.')

# ceph version show mon daemon version

mon_started=$(wait_for_daemon "sudo systemctl is-active --quiet ceph-mon@$(hostname)")

if $mon_started; then

ceph_version_str=$(sudo ceph version | cut -d ' ' -f 3 | \

cut -f 1,2 -d '.')

else

die $LINENO "ceph-mon@${hostname} is not running and it's not possible to \

retrieve it's version"

fi

else

die $LINENO "Invalid argument. The get_ceph_version function needs \

an argument that can be 'cli' or 'mon'."