openstack
/
openstack-helm-infra
Code Issues Proposed changes

[CEPH] Fix a race condition with udev on OSD start 

Under some conditions udev may not trigger correctly and create
the proper uuid symlinks required by Ceph. In order to work around
this we manually create the symlinks.

Change-Id: Icadce2c005864906bcfdae4d28117628c724cc1c
This commit is contained in:
Matthew Heler 2019-01-17 20:19:32 -06:00
parent 958127477d
commit b0da8d78d1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-osd/templates/bin/osd/_block.sh.tpl
View File

@ -49,8 +49,7 @@ CEPH_DISK_OPTIONS=""
CEPH_OSD_OPTIONS=""
DATA_UUID=$(blkid -o value -s PARTUUID ${OSD_DEVICE}*1)
# watch the udev event queue, and exit if all current events are handled
udevadm settle --timeout=600
udev_settle
DATA_PART=$(dev_part ${OSD_DEVICE} 1)
MOUNTED_PART=${DATA_PART}

9
ceph-osd/templates/bin/osd/_common.sh.tpl
View File

@ -153,7 +153,16 @@ function osd_pg_interval_fix {
function udev_settle {
partprobe "${OSD_DEVICE}"
if [ "x$JOURNAL_TYPE" == "xblock-logical" ]; then
partprobe "${OSD_JOURNAL}"
fi
# watch the udev event queue, and exit if all current events are handled
udevadm settle --timeout=600
# 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
ln -s "../../$(echo ${dev} | awk -F '/' '{print $3}')" "/dev/disk/by-partuuid/$(blkid -o value -s PARTUUID ${dev})" || true
done
}