diff --git a/runner/migrations/0058_auto_20231114_1310.py b/runner/migrations/0058_auto_20231114_1310.py new file mode 100644 index 000000000..6dccc8365 --- /dev/null +++ b/runner/migrations/0058_auto_20231114_1310.py @@ -0,0 +1,28 @@ +# Generated by Django 2.2.28 on 2023-11-14 18:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("runner", "0057_auto_20230424_0743"), + ] + + operations = [ + migrations.AddField( + model_name="pipeline", + name="tool_walltime", + field=models.IntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name="run", + name="restart_attempts", + field=models.IntegerField(default=0), + ), + migrations.AlterField( + model_name="run", + name="resume_attempts", + field=models.IntegerField(default=3), + ), + ] diff --git a/runner/models.py b/runner/models.py index e3aa1c3b2..dd1803c79 100644 --- a/runner/models.py +++ b/runner/models.py @@ -70,6 +70,7 @@ class Pipeline(BaseModel): operator = models.ForeignKey(Operator, on_delete=models.SET_NULL, null=True, blank=True) default = models.BooleanField(default=False) walltime = models.IntegerField(blank=True, null=True) + tool_walltime = models.IntegerField(blank=True, null=True) memlimit = models.CharField(blank=True, null=True, max_length=20) config = models.CharField(blank=True, null=True, max_length=1000, default=None) diff --git a/runner/tasks.py b/runner/tasks.py index cd26b55c6..1de027d36 100644 --- a/runner/tasks.py +++ b/runner/tasks.py @@ -493,6 +493,8 @@ def submit_job(run_id, output_directory=None, execution_id=None, log_directory=N url = settings.RIDGEBACK_URL + "/v0/jobs/" if run.app.walltime: job["walltime"] = run.app.walltime + if run.app.tool_walltime: + job["tool_walltime"] = run.app.tool_walltime if run.app.memlimit: job["memlimit"] = run.app.memlimit if run.app.output_permission: