From b5789283ddb09a4a8eb51b25d812ae01018483b7 Mon Sep 17 00:00:00 2001 From: Chinasubbareddy Mallavarapu Date: Tue, 19 Mar 2019 17:17:42 -0500 Subject: [PATCH] [ceph-osd] Fix ceph osd init script to handle udev This is to fix udev_settle function by adding timeout for blkid command as it will get stuck on the host sometimes. Change-Id: I378748991eecda9ea2af383ea04ecd97ab3d2948 --- ceph-osd/templates/bin/osd/_common.sh.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph-osd/templates/bin/osd/_common.sh.tpl b/ceph-osd/templates/bin/osd/_common.sh.tpl index 723f2a424..a2e1249a4 100644 --- a/ceph-osd/templates/bin/osd/_common.sh.tpl +++ b/ceph-osd/templates/bin/osd/_common.sh.tpl @@ -164,7 +164,7 @@ function udev_settle { # On occassion udev may not make the correct device symlinks for Ceph, just in case we make them manually mkdir -p /dev/disk/by-partuuid - for dev in $(blkid -o device | grep -v block); do + for dev in $(timeout 60 blkid -o device | grep -Ev 'block|rbd'); do ln -s "../../$(echo ${dev} | awk -F '/' '{print $3}')" "/dev/disk/by-partuuid/$(blkid -o value -s PARTUUID ${dev})" || true done }