Merge pull request #156 from SubstraFoundation/fix-celery-scheduler

fix celery scheduler
Substra · Feb 18, 2020 · 94c7778 · 94c7778
2 parents 8cb2234 + 9c34449
commit 94c7778
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/backend/backend/celery.py b/backend/backend/celery.py
@@ -21,13 +21,20 @@
 
 @app.on_after_configure.connect
 def setup_periodic_tasks(sender, **kwargs):
-    from substrapp.tasks.tasks import prepare_training_task, prepare_testing_task
+    from substrapp.tasks.tasks import (prepare_training_task,
+                                       prepare_testing_task,
+                                       prepare_aggregate_task,
+                                       prepare_composite_training_task)
 
     period = int(os.environ.get('SCHEDULE_TASK_PERIOD', 3 * 3600))
     sender.add_periodic_task(period, prepare_training_task.s(), queue='scheduler',
                              name='query Traintuples to prepare train task on todo traintuples')
     sender.add_periodic_task(period, prepare_testing_task.s(), queue='scheduler',
                              name='query Testuples to prepare test task on todo testuples')
+    sender.add_periodic_task(period, prepare_aggregate_task.s(), queue='scheduler',
+                             name='query Aggregatetuples to prepare task on todo aggregatetuples')
+    sender.add_periodic_task(period, prepare_composite_training_task.s(), queue='scheduler',
+                             name='query CompositeTraintuples to prepare task on todo composite_traintuples')
 
 
 @after_task_publish.connect

diff --git a/backend/substrapp/tasks/tasks.py b/backend/substrapp/tasks/tasks.py
@@ -428,6 +428,11 @@ def prepare_testing_task():
     prepare_task(TESTTUPLE_TYPE)
 
 
+@app.task(ignore_result=True)
+def prepare_composite_training_task():
+    prepare_task(COMPOSITE_TRAINTUPLE_TYPE)
+
+
 @app.task(ignore_result=True)
 def prepare_aggregate_task():
     prepare_task(AGGREGATETUPLE_TYPE)