openstack/openstack-helm-infra
Code Issues Proposed changes

[ceph-osd] Don't set CEPH_LVM_PREPARE to 0 for colocated db/wal

Browse Source 
Due to some recent reordering of the Bluestore OSD init code, the check
for empty db and wal device strings that sets CEPH_LVM_PREPARE to 0 is
now incorrect as it checks for an existing volume group on the OSD
device to determine if an OSD previously existed on the device. That
device is now initialized prior to this check, so the check is invalid.
This change removes it.

Change-Id: I5236de171d94930e08770537663b14c2eedb0b32
This commit is contained in:
Stephen Taylor 2020-09-11 19:29:21 +00:00
parent 74996ccce8
commit 7bc1f4559e
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,11 +417,6 @@ function osd_disk_prepare {
elif [[ ${BLOCK_DB} && -z ${BLOCK_WAL} ]]; then
prep_device "${BLOCK_DB}" "${BLOCK_DB_SIZE}" "db" "${OSD_DEVICE}"
fi
if [ -z ${BLOCK_DB} ] && [ -z ${BLOCK_WAL} ]; then
if pvdisplay ${OSD_DEVICE} | awk '/VG Name/{print $3}' | grep "ceph"; then
CEPH_LVM_PREPARE=0
fi
fi
else
if pvdisplay ${OSD_DEVICE} | awk '/VG Name/{print $3}' | grep "ceph"; then
CEPH_LVM_PREPARE=0