opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-31 02:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21929 from ksuderman/dont-delete-batch-jobs

Browse Source 
Add `delete_completed_jobs` option to GCP Batch runner
This commit is contained in:
Marius van den Beek
2026-03-02 11:40:14 +01:00
committed by GitHub
parent 82b4426fb4 1cb066aafb
commit 468b60dba8
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/gcp_batch.py
+22 -2
View File
@@ -90,6 +90,8 @@ class GoogleCloudBatchJobRunner(AsynchronousJobRunner):
),
# Custom VM image (optional)
"custom_vm_image": dict(map=str, default=None),
# Job cleanup: if true, delete GCP Batch jobs after Galaxy marks them complete
"delete_completed_jobs": dict(map=bool, default=True),
# Object store fallback (for future use)
"use_object_store": dict(map=bool, default=False),
"object_store_path": dict(map=str, default=None),
@@ -759,12 +761,30 @@ class GoogleCloudBatchJobRunner(AsynchronousJobRunner):
batch_job_name = job.get_job_runner_external_id()
if batch_job_name:
if not self.runner_params.get("delete_completed_jobs", True):
try:
job_path = f"projects/{self.runner_params['project_id']}/locations/{self.runner_params['region']}/jobs/{batch_job_name}"
batch_job = self.batch_client.get_job(name=job_path)
if batch_job.status.state in (
batch_v1.JobStatus.State.SUCCEEDED,
batch_v1.JobStatus.State.FAILED,
):
log.info("Retaining completed Batch job %s (delete_completed_jobs=false)", batch_job_name)
return
except gcp_exceptions.NotFound:
log.debug("Batch job %s already deleted", batch_job_name)
return
except Exception as e:
log.warning("Failed to check Batch job %s status, proceeding with delete: %s", batch_job_name, e)
try:
job_path = f"projects/{self.runner_params['project_id']}/locations/{self.runner_params['region']}/jobs/{batch_job_name}"
self.batch_client.delete_job(name=job_path)
log.info("Cancelled Batch job %s", batch_job_name)
log.info("Deleted Batch job %s", batch_job_name)
except gcp_exceptions.NotFound:
log.debug("Batch job %s already deleted", batch_job_name)
except Exception as e:
log.error("Failed to cancel Batch job %s: %s", batch_job_name, e)
log.error("Failed to delete Batch job %s: %s", batch_job_name, e)
else:
log.warning("Could not stop job %s - no external job ID", job.id)