starlingx
/
integ
Code Issues Proposed changes

Merge "Fix Ceph processes start race condition"

This commit is contained in:
Zuul 2023-06-13 23:05:40 +00:00 committed by Gerrit Code Review
parent 8ee6262720 ad20667beb
commit d03fd2ebaa
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ceph/ceph/files/ceph.sh
View File

@ -26,17 +26,10 @@ logecho ()
start () start ()
{ {
if [[ "$system_type" != "All-in-one" ]] || [[ "$system_mode" != "duplex" ]]; then # Defer ceph initialization to avoid race conditions. Let SM and Pmon to start the
logecho "Starting ceph services..." # processes in the appropriate time.
${INITDIR}/ceph start >> ${LOGFILE} 2>&1 # Set the flag to let ceph start later.
RC=$? logecho "Setting flag to enable ceph processes to start."
else
# In an AIO-DX configuration SM manages the floating MON and OSDs and pmon manages
# the ceph-mds process. Here we defer starting all ceph process to allow SM and pmon
# to start them at the appropriate time.
RC=0
fi
if [ ! -f ${CEPH_FILE} ]; then if [ ! -f ${CEPH_FILE} ]; then
touch ${CEPH_FILE} touch ${CEPH_FILE}
fi fi
@ -55,7 +48,7 @@ stop ()
rm -f ${CEPH_FILE} rm -f ${CEPH_FILE}
fi fi
${INITDIR}/ceph stop >> ${LOGFILE} 2>&1 ${INITDIR}/ceph-init-wrapper stop >> ${LOGFILE} 2>&1
RC=$? RC=$?
} }