From 695d10b02aa3e68a2dc2aaa313970e8828a889d5 Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 4 Nov 2021 15:37:54 -0500 Subject: [PATCH 1/3] Added indexes --- lib/execution_engine2/db/models/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/execution_engine2/db/models/models.py b/lib/execution_engine2/db/models/models.py index 99e115412..4f8fa6748 100644 --- a/lib/execution_engine2/db/models/models.py +++ b/lib/execution_engine2/db/models/models.py @@ -336,7 +336,11 @@ class Job(Document): default=False ) # Marked true when all retry steps have completed - meta = {"collection": "ee2_jobs"} + # See https://docs.mongoengine.org/guide/defining-documents.html#indexes + # Hmm, are these indexes need to be + or - ? + indexes = [("status", "-created"), ("status", "-queued")] + + meta = {"collection": "ee2_jobs", "indexes": indexes} def save(self, *args, **kwargs): self.updated = time.time() From ce64fd25c8c2fd55dd49a92eccde39eb53575848 Mon Sep 17 00:00:00 2001 From: bio-boris Date: Thu, 4 Nov 2021 16:12:52 -0500 Subject: [PATCH 2/3] Oh can run .explain() to see if its working --- lib/execution_engine2/db/models/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/execution_engine2/db/models/models.py b/lib/execution_engine2/db/models/models.py index 4f8fa6748..4da4fd382 100644 --- a/lib/execution_engine2/db/models/models.py +++ b/lib/execution_engine2/db/models/models.py @@ -338,7 +338,7 @@ class Job(Document): # See https://docs.mongoengine.org/guide/defining-documents.html#indexes # Hmm, are these indexes need to be + or - ? - indexes = [("status", "-created"), ("status", "-queued")] + indexes = [("status", "batch_job"), ("status", "-queued")] meta = {"collection": "ee2_jobs", "indexes": indexes} From 874275a42587538f399b2bc29c61bff6a2e65309 Mon Sep 17 00:00:00 2001 From: bio-boris Date: Fri, 5 Nov 2021 15:24:19 -0500 Subject: [PATCH 3/3] Update models.py --- lib/execution_engine2/db/models/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/execution_engine2/db/models/models.py b/lib/execution_engine2/db/models/models.py index 4da4fd382..47624cd4f 100644 --- a/lib/execution_engine2/db/models/models.py +++ b/lib/execution_engine2/db/models/models.py @@ -338,7 +338,7 @@ class Job(Document): # See https://docs.mongoengine.org/guide/defining-documents.html#indexes # Hmm, are these indexes need to be + or - ? - indexes = [("status", "batch_job"), ("status", "-queued")] + indexes = [("status", "batch_job"), ("status", "queued")] meta = {"collection": "ee2_jobs", "indexes": indexes}