openstack/openstack-helm
Code Issues Proposed changes

Fix for ceph-osd regression

Browse Source 
When ceph-osd journal as a directory and data as
 a block device ceph-osd fails to deploy while
waiting for the journal file in
/var/lib/ceph/journal/journal.<id>

Added the condition before checking bluestore for
directory and removed the same later in the script

Closes-Bug: #1811154
Change-Id: Ibd4cf0be5ed90dfc4de5ffab554a91da1b62e5f4
Signed-off-by: Kranthi Guttikonda <kranthi.guttikonda@b-yond.com>
Signed-off-by: kranthi guttikonda <kranthi.guttikonda9@gmail.com>
This commit is contained in:
kranthi guttikonda 2019-01-09 17:24:27 -05:00
parent 8662018a4d
commit 6771440f4a
1 changed files with 1 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

@ -83,8 +83,8 @@ if [ "${OSD_BLUESTORE:-0}" -ne 1 ]; then
fi fi
if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then
OSD_JOURNAL="${OSD_JOURNAL}/journal.${OSD_ID}" OSD_JOURNAL="${OSD_JOURNAL}/journal.${OSD_ID}"
touch ${OSD_JOURNAL}
wait_for_file "${OSD_JOURNAL}" wait_for_file "${OSD_JOURNAL}"
chown ceph. "${OSD_JOURNAL}"
else else
if [ ! -b "${OSD_JOURNAL}" ]; then if [ ! -b "${OSD_JOURNAL}" ]; then
echo "ERROR: Unable to find journal device ${OSD_JOURNAL}" echo "ERROR: Unable to find journal device ${OSD_JOURNAL}"
@ -110,7 +110,6 @@ if [ "${OSD_BLUESTORE:-0}" -ne 1 ]; then
fi fi
if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then if [ "x${JOURNAL_TYPE}" == "xdirectory" ]; then
touch ${OSD_JOURNAL}
chown -R ceph. /var/lib/ceph/journal chown -R ceph. /var/lib/ceph/journal
ceph-osd \ ceph-osd \
--cluster ceph \ --cluster ceph \