Track execution timeout in schedule model

Signed-off-by: Keshav Priyadarshi <git@keshav.space>

Author: keshav-space

vulnerabilities/migrations/0092_pipelineschedule_pipelinerun.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.20 on 2025-05-12 17:04
+# Generated by Django 4.2.20 on 2025-05-21 19:32
 
 import django.core.validators
 from django.db import migrations, models
@@ -65,6 +65,21 @@ class Migration(migrations.Migration):
                         unique=True,
                     ),
                 ),
+                (
+                    "execution_timeout",
+                    models.PositiveSmallIntegerField(
+                        default=24,
+                        help_text="Number hours before pipeline execution is forcefully terminated.",
+                        validators=[
+                            django.core.validators.MinValueValidator(
+                                1, message="Pipeline timeout must be at least 1 hour."
+                            ),
+                            django.core.validators.MaxValueValidator(
+                                72, message="Pipeline timeout must be at most 72 hours."
+                            ),
+                        ],
+                    ),
+                ),
                 ("created_date", models.DateTimeField(auto_now_add=True, db_index=True)),
             ],
             options={

vulnerabilities/models.py

@@ -21,7 +21,6 @@
 
 import django_rq
 import redis
-from aboutcode.pipeline import humanize_time
 from cvss.exceptions import CVSS2MalformedError
 from cvss.exceptions import CVSS3MalformedError
 from cvss.exceptions import CVSS4MalformedError
@@ -65,6 +64,7 @@
 from vulnerabilities.utils import normalize_purl
 from vulnerabilities.utils import purl_to_dict
 from vulnerablecode import __version__ as VULNERABLECODE_VERSION
+from vulnerablecode.settings import VULNERABLECODE_PIPELINE_TIMEOUT
 
 logger = logging.getLogger(__name__)
 
@@ -2147,6 +2147,15 @@ class PipelineSchedule(models.Model):
         help_text=("Identifier used to manage the periodic run job."),
     )
 
+    execution_timeout = models.PositiveSmallIntegerField(
+        validators=[
+            MinValueValidator(1, message="Pipeline timeout must be at least 1 hour."),
+            MaxValueValidator(72, message="Pipeline timeout must be at most 72 hours."),
+        ],
+        default=VULNERABLECODE_PIPELINE_TIMEOUT,
+        help_text=("Number hours before pipeline execution is forcefully terminated."),
+    )
+
     created_date = models.DateTimeField(
         auto_now_add=True,
         db_index=True,

vulnerabilities/schedules.py

@@ -36,7 +36,7 @@ def schedule_execution(pipeline_schedule, execute_now=False):
         func=enqueue_pipeline,
         args=[pipeline_schedule.pipeline_id],
         interval=interval_in_seconds,
-        timeout=VULNERABLECODE_PIPELINE_TIMEOUT,
+        result_ttl=f"{VULNERABLECODE_PIPELINE_TIMEOUT}h",
         repeat=None,
     )
     return job._id

vulnerabilities/tasks.py

@@ -115,7 +115,7 @@ def enqueue_pipeline(pipeline_id):
         run.run_id,
         job_id=str(run.run_id),
         on_failure=set_run_failure,
-        job_timeout=VULNERABLECODE_PIPELINE_TIMEOUT,
+        job_timeout=f"{pipeline_schedule.execution_timeout}h",
     )
 
 

vulnerablecode/settings.py

@@ -366,13 +366,12 @@
     }
 
 
-VULNERABLECODE_ASYNC = True
-VULNERABLECODE_PIPELINE_TIMEOUT = "24h"
+VULNERABLECODE_PIPELINE_TIMEOUT = env.int("VULNERABLECODE_PIPELINE_TIMEOUT", default=24)
 RQ_QUEUES = {
     "default": {
         "HOST": env.str("VULNERABLECODE_REDIS_HOST", default="localhost"),
         "PORT": env.str("VULNERABLECODE_REDIS_PORT", default="6379"),
         "PASSWORD": env.str("VULNERABLECODE_REDIS_PASSWORD", default=""),
-        "DEFAULT_TIMEOUT": env.int("VULNERABLECODE_REDIS_DEFAULT_TIMEOUT", default=360),
+        "DEFAULT_TIMEOUT": env.int("VULNERABLECODE_REDIS_DEFAULT_TIMEOUT", default=3600),
     }
 }