[jobs] Keep job results in SortingHat one week

This commit updates the retention period for job results in SortingHat to one week. Signed-off-by: Jose Javier Merchante <[email protected]>
chaoss · Aug 6, 2024 · 9f8c9fe · 9f8c9fe
1 parent b152145
commit 9f8c9fe
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/releases/unreleased/job-results-in-sortinghat.yml b/releases/unreleased/job-results-in-sortinghat.yml
@@ -0,0 +1,8 @@
+---
+title: Job results in SortingHat
+category: fixed
+author: Jose Javier Merchante <[email protected]>
+issue: null
+notes: >
+  Fixed a bug that caused jobs to be missing in SortingHat.
+  Job results will be kept in SortingHat for one week.
diff --git a/sortinghat/core/jobs.py b/sortinghat/core/jobs.py
@@ -51,6 +51,7 @@
 
 
 MAX_CHUNK_SIZE = 2000
+DEFAULT_JOB_RESULT_TTL = 60 * 60 * 24 * 7  # seconds
 
 
 logger = logging.getLogger(__name__)
@@ -866,6 +867,8 @@ def schedule_task(ctx, fn, task, scheduled_datetime=None, **kwargs):
                                                   on_success=on_success_job,
                                                   on_failure=on_failed_job,
                                                   job_timeout=-1,
+                                                  result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                                  failure_ttl=DEFAULT_JOB_RESULT_TTL,
                                                   **kwargs)
     task.scheduled_datetime = scheduled_datetime
     task.job_id = job.id

diff --git a/sortinghat/core/schema.py b/sortinghat/core/schema.py
@@ -102,6 +102,7 @@
 
 
 DEFAULT_IMPORT_IDENTITIES_INTERVAL = 60 * 24 * 7  # minutes
+DEFAULT_JOB_RESULT_TTL = 60 * 60 * 24 * 7  # seconds
 
 
 @convert_django_field.register(JSONField)
@@ -1109,7 +1110,9 @@ def mutate(self, info, uuids=None, last_modified=MIN_PERIOD_DATE):
 
         job = get_tenant_queue(tenant).enqueue(recommend_affiliations,
                                                ctx, uuids, last_modified,
-                                               job_timeout=-1)
+                                               job_timeout=-1,
+                                               result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                               failure_ttl=DEFAULT_JOB_RESULT_TTL)
 
         return RecommendAffiliations(
             job_id=job.id
@@ -1154,7 +1157,9 @@ def mutate(self, info, criteria,
                                                strict,
                                                match_source,
                                                last_modified,
-                                               job_timeout=-1)
+                                               job_timeout=-1,
+                                               result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                               failure_ttl=DEFAULT_JOB_RESULT_TTL)
 
         return RecommendMatches(
             job_id=job.id
@@ -1179,7 +1184,9 @@ def mutate(self, info, uuids=None, exclude=True, no_strict_matching=False):
         job = get_tenant_queue(tenant).enqueue(recommend_gender,
                                                ctx, uuids,
                                                exclude, no_strict_matching,
-                                               job_timeout=-1)
+                                               job_timeout=-1,
+                                               result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                               failure_ttl=DEFAULT_JOB_RESULT_TTL)
 
         return RecommendGender(
             job_id=job.id
@@ -1203,7 +1210,9 @@ def mutate(self, info, uuids=None, last_modified=MIN_PERIOD_DATE):
 
         job = get_tenant_queue(tenant).enqueue(affiliate, ctx, uuids,
                                                last_modified,
-                                               job_timeout=-1)
+                                               job_timeout=-1,
+                                               result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                               failure_ttl=DEFAULT_JOB_RESULT_TTL)
 
         return Affiliate(
             job_id=job.id
@@ -1247,7 +1256,9 @@ def mutate(self, info, criteria,
                                                strict,
                                                match_source,
                                                last_modified,
-                                               job_timeout=-1)
+                                               job_timeout=-1,
+                                               result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                               failure_ttl=DEFAULT_JOB_RESULT_TTL)
 
         return Unify(
             job_id=job.id
@@ -1271,7 +1282,9 @@ def mutate(self, info, uuids=None, exclude=True, no_strict_matching=False):
 
         job = get_tenant_queue(tenant).enqueue(genderize, ctx, uuids,
                                                exclude, no_strict_matching,
-                                               job_timeout=-1)
+                                               job_timeout=-1,
+                                               result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                               failure_ttl=DEFAULT_JOB_RESULT_TTL)
 
         return Genderize(
             job_id=job.id
@@ -1431,7 +1444,9 @@ def mutate(self, info, backend, url, params=None):
 
         job = get_tenant_queue(tenant).enqueue(import_identities, ctx,
                                                backend, url, params,
-                                               job_timeout=-1)
+                                               job_timeout=-1,
+                                               result_ttl=DEFAULT_JOB_RESULT_TTL,
+                                               failure_ttl=DEFAULT_JOB_RESULT_TTL)
 
         return ImportIdentities(
             job_id=job.id
@@ -1529,7 +1544,6 @@ def mutate(self, info, task_id, data):
             new_dt = datetime.datetime.now(datetime.timezone.utc) \
                 + datetime.timedelta(minutes=task.interval)
             if task.scheduled_datetime and task.scheduled_datetime > new_dt:
-                find_job(task.job_id, tenant)
                 if task.job_id:
                     job = find_job(task.job_id, tenant)
                     if job: