openstack/openstack-helm-infra
Code Issues Proposed changes

[Ceph-OSD] Update exit code for flock

Browse Source 
The PS updates the exit code for flock. Now we are using default value (1)
if timeout happened.

Change-Id: I2d1cd051c61695a12aa11af1ecb356f91b9e8279
This commit is contained in:
Kabanov, Dmitrii 2019-12-30 09:41:35 -08:00
parent e95a8b8b09
commit cd6f3442e9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl
View File

@ -182,7 +182,7 @@ function osd_disk_prepare {
block_wal_string=$(echo ${BLOCK_WAL} | awk -F "/" '{print $2}{print $3}' | paste -s -d'-')
fi
exec {lock_fd}>/var/lib/ceph/tmp/init-osd.lock || exit 1
flock -w 60 -E 0 --verbose "${lock_fd}"
flock -w 60 --verbose "${lock_fd}"
if [[ ${BLOCK_DB} && ${BLOCK_WAL} ]]; then
if [[ ${block_db_string} == ${block_wal_string} ]]; then
if [[ $(vgdisplay | grep "VG Name" | awk '{print $3}' | grep "${block_db_string}") ]]; then