Merge branch 'rq-queue-high' into 'master'

Send deletion jobs as high priority jobs

See merge request !1076

Makefile

@@ -21,7 +21,7 @@ binary:
 	CI_PROJECT_DIR=$(ROOT_DIR) CI_REGISTRY_IMAGE=$(IMAGE_TAG) COMMON_BRANCH=$(COMMON_BRANCH) PONOS_BRANCH=$(PONOS_BRANCH) $(ROOT_DIR)/ci/build.sh Dockerfile.binary -binary
 
 worker:
-	arkindex/manage.py rqworker -v 2
+	arkindex/manage.py rqworker -v 2 default high
 
 test-fixtures:
 	$(eval export PGPASSWORD=devdata)

arkindex/documents/tasks.py

@@ -108,7 +108,7 @@ def reindex_start(corpus_id: Optional[str] = None,
         indexer.run_index(entities_queryset, bulk_size=400)
 
 
-@job
+@job('high')
 def ml_results_delete(corpus_id: Optional[str] = None,
                       element_id: Optional[str] = None,
                       batch_size: int = 1000) -> None:
@@ -153,7 +153,7 @@ def ml_results_delete(corpus_id: Optional[str] = None,
     ), batch_size)
 
 
-@job
+@job('high')
 def corpus_delete(corpus_id: str) -> None:
     corpus = Corpus.objects.get(id=corpus_id)
     logger.info(f'Deleting {corpus!r}')

arkindex/project/settings.py

@@ -297,6 +297,13 @@ RQ_QUEUES = {
         'DB': conf['redis']['db'],
         'PASSWORD': conf['redis']['password'],
         'DEFAULT_TIMEOUT': conf['redis']['timeout'],
+    },
+    'high': {
+        'HOST': conf['redis']['host'],
+        'PORT': conf['redis']['port'],
+        'DB': conf['redis']['db'],
+        'PASSWORD': conf['redis']['password'],
+        'DEFAULT_TIMEOUT': conf['redis']['timeout'],
     }
 }