Merge pull request #18997 from davelopez/fix_cleanup_job_directory

Fix job directory not being cleaned up
galaxyproject · Oct 15, 2024 · fb540bc · fb540bc
2 parents c71ecab + f83a6d8
commit fb540bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
@@ -2157,7 +2157,9 @@ def cleanup(self, delete_files: bool = True) -> None:
                         if e.errno != errno.ENOENT:
                             raise
             if delete_files:
-                self.object_store.delete(self.get_job(), base_dir="job_work", entire_dir=True, obj_dir=True)
+                self.object_store.delete(
+                    self.get_job(), base_dir="job_work", entire_dir=True, dir_only=True, obj_dir=True
+                )
         except Exception:
             log.exception("Unable to cleanup job %d", self.job_id)
 

diff --git a/lib/galaxy/objectstore/__init__.py b/lib/galaxy/objectstore/__init__.py
@@ -218,6 +218,7 @@ def delete(
         obj,
         entire_dir: bool = False,
         base_dir=None,
+        dir_only=False,
         extra_dir=None,
         extra_dir_at_root=False,
         alt_name=None,
@@ -572,6 +573,7 @@ def delete(
         obj,
         entire_dir: bool = False,
         base_dir=None,
+        dir_only=False,
         extra_dir=None,
         extra_dir_at_root=False,
         alt_name=None,
@@ -582,6 +584,7 @@ def delete(
             obj,
             entire_dir=entire_dir,
             base_dir=base_dir,
+            dir_only=dir_only,
             extra_dir=extra_dir,
             extra_dir_at_root=extra_dir_at_root,
             alt_name=alt_name,