From 42fc5ebe3e18422905161ecb8e1c543d14569d7f Mon Sep 17 00:00:00 2001 From: dvanaken Date: Thu, 6 Feb 2020 15:48:31 -0500 Subject: [PATCH] Update celery commands --- .travis.yml | 2 -- docker/start-test.sh | 1 + docker/start.sh | 7 ++----- script/formatting/config/pylintrc | 2 +- server/website/website/management/commands/stopcelery.py | 2 ++ 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index cef3842..aad219a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,7 +114,6 @@ matrix: before_install: - mysql -e "CREATE DATABASE IF NOT EXISTS ${DB_NAME}" - sed -i '/psycopg2/d' $WEB/requirements.txt - - sed -i 's/^RUN_EVERY =.*$/RUN_EVERY = 180/' $WEB/website/settings/constants.py script: - cd $WEB && python manage.py runserver 0.0.0.0:8000 & - sleep 10 && cd $DRIVER && fab integration_tests @@ -132,7 +131,6 @@ matrix: before_install: - psql -U postgres -c "CREATE DATABASE ${DB_NAME}" - sed -i '/mysqlclient/d' $WEB/requirements.txt - - sed -i 's/^RUN_EVERY =.*$/RUN_EVERY = 180/' $WEB/website/settings/constants.py script: - cd $WEB && python manage.py runserver 0.0.0.0:8000 & - sleep 10 && cd $DRIVER && fab integration_tests diff --git a/docker/start-test.sh b/docker/start-test.sh index 917177d..59a2b25 100755 --- a/docker/start-test.sh +++ b/docker/start-test.sh @@ -7,6 +7,7 @@ python3 manage.py makemigrations website python3 manage.py migrate +python3 manage.py stopcelery python3 manage.py startcelery python3 manage.py runserver 0.0.0.0:8000 & diff --git a/docker/start.sh b/docker/start.sh index b37cf70..70677d3 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -5,15 +5,12 @@ addrport="0.0.0.0:8000" # Wait for backend connection /bin/bash wait-for-it.sh -# Kill any existing celery processes -pkill -9 -f celery -rm -f *.pid - ## Needs a connection to a DB so migrations go here python3 manage.py makemigrations website python3 manage.py migrate python3 manage.py createuser admin $ADMIN_PASSWORD --superuser -python3 manage.py startcelery +python3 manage.py stopcelery +python3 manage.py startcelery echo "" echo "-=------------------------------------------------------" diff --git a/script/formatting/config/pylintrc b/script/formatting/config/pylintrc index 2381a73..9fcdc52 100644 --- a/script/formatting/config/pylintrc +++ b/script/formatting/config/pylintrc @@ -13,7 +13,7 @@ profile=no # Add files or directories to the blacklist. They should be base names, not # paths. -ignore=CVS,.git,manage.py,0001_initial.py,0002_enable_compression.py,0003_load_initial_data.py,0004_add_lhs.py,0005_add_workload_field.py,0006_session_hyperparameters.py,0007_executiontime.py,credentials.py,create_knob_settings.py +ignore=CVS,.git,manage.py,0001_initial.py,0002_enable_compression.py,0003_load_initial_data.py,0004_add_lhs.py,0005_add_workload_field.py,0006_session_hyperparameters.py,0007_executiontime.py,0008_change_result_taskids_field.py,credentials.py,create_knob_settings.py # ignore-patterns=**/migrations/*.py diff --git a/server/website/website/management/commands/stopcelery.py b/server/website/website/management/commands/stopcelery.py index 2385255..e528755 100644 --- a/server/website/website/management/commands/stopcelery.py +++ b/server/website/website/management/commands/stopcelery.py @@ -57,4 +57,6 @@ class Command(BaseCommand): "Successfully stopped '{}'.".format(name))) with quiet(): + local("ps auxww | grep '[c]elery worker' | awk '{print $2}' | xargs kill -9") + local("ps auxww | grep '[c]elerybeat' | awk '{print $2}' | xargs kill -9") local('rm -f {} {}'.format(options['celery_pidfile'], options['celerybeat_pidfile']))