From cd6f3442e9e17c366be2d3d9242b7f9ba214a945 Mon Sep 17 00:00:00 2001 From: "Kabanov, Dmitrii" Date: Mon, 30 Dec 2019 09:41:35 -0800 Subject: [PATCH] [Ceph-OSD] Update exit code for flock The PS updates the exit code for flock. Now we are using default value (1) if timeout happened. Change-Id: I2d1cd051c61695a12aa11af1ecb356f91b9e8279 --- .../templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl b/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl index e1c5160102..57f0238e3b 100644 --- a/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl +++ b/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl @@ -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