From b1fc592131286ebbede2693be8c86636f0039011 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Wed, 14 Oct 2015 15:43:43 +0100 Subject: toaster: Always run bldcontrol migrations The toaster startup script conditionally migrates the database tables depending on whether you are in managed mode or not. This means that if you are in analysis mode, some of the bldcontrol* database tables used by managed mode are not available. As a consequence, some of the code in toaster which refers to those tables can break in analysis mode, as there's no clean isolation of the two modes. To prevent this from happening, always run the migrations for managed mode and create the bldcontrol* tables, even if in analysis mode. Also clean up the function which starts up toaster so the logic is easier to follow. [YOCTO #8277] Signed-off-by: Elliot Smith Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bin/toaster | 56 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/bin/toaster b/bin/toaster index bc439e6d3..e976604c5 100755 --- a/bin/toaster +++ b/bin/toaster @@ -59,29 +59,50 @@ webserverStartAll() python $BBBASEDIR/lib/toaster/manage.py syncdb --noinput || retval=1 python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=2 + if [ $retval -eq 1 ]; then - echo "Failed db sync, stopping system start" 1>&2 - elif [ $retval -eq 2 ]; then - printf "\nError on migration, trying to recover... \n" + echo "Failed db sync, aborting system start" 1>&2 + return $retval + fi + + python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=1 + + if [ $retval -eq 1 ]; then + printf "\nError on orm migration, rolling back...\n" python $BBBASEDIR/lib/toaster/manage.py migrate orm 0001_initial --fake - retval=0 - python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=1 + return $retval fi + + python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol || retval=1 + + if [ $retval -eq 1 ]; then + printf "\nError on bldcontrol migration, rolling back...\n" + python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol 0001_initial --fake + return $retval + fi + if [ "$TOASTER_MANAGED" = '1' ]; then - python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol || retval=1 - python $BBBASEDIR/lib/toaster/manage.py checksettings --traceback || retval=1 + python $BBBASEDIR/lib/toaster/manage.py checksettings --traceback || retval=1 fi - if [ $retval -eq 0 ]; then - echo "Starting webserver..." - python $BBBASEDIR/lib/toaster/manage.py runserver "0.0.0.0:$WEB_PORT" >${BUILDDIR}/toaster_web.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid - sleep 1 - if ! cat "${BUILDDIR}/.toastermain.pid" | xargs -I{} kill -0 {} ; then - retval=1 - rm "${BUILDDIR}/.toastermain.pid" - else - echo "Webserver address: http://0.0.0.0:$WEB_PORT/" - fi + + if [ $retval -eq 1 ]; then + printf "\nError while checking settings; aborting\n" + return $retval + fi + + echo "Starting webserver..." + + python $BBBASEDIR/lib/toaster/manage.py runserver "0.0.0.0:$WEB_PORT" >${BUILDDIR}/toaster_web.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid + + sleep 1 + + if ! cat "${BUILDDIR}/.toastermain.pid" | xargs -I{} kill -0 {} ; then + retval=1 + rm "${BUILDDIR}/.toastermain.pid" + else + echo "Webserver address: http://0.0.0.0:$WEB_PORT/" fi + return $retval } @@ -375,3 +396,4 @@ case $CMD in echo "Successful ${CMD}." ;; esac + -- cgit 1.2.3-korg