From 63b63e7d6f146d23f3ce2f2a07fc32846df283b7 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 19 Mar 2026 14:43:04 +0100 Subject: [PATCH] Don't fail on probable delete race Fixes https://github.com/galaxyproject/galaxy/issues/22182 --- lib/galaxy/model/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 58345f05681..750a154a162 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -4737,14 +4737,16 @@ class Dataset(Base, StorableObject, Serializable): def full_delete(self): """Remove the file and extra files, marks deleted and purged""" - # os.unlink( self.file_name ) try: self.object_store.delete(self) except galaxy.exceptions.ObjectNotFound: pass if (rel_path := self._extra_files_rel_path) is not None: if self.object_store.exists(self, extra_dir=rel_path, dir_only=True): - self.object_store.delete(self, entire_dir=True, extra_dir=rel_path, dir_only=True) + try: + self.object_store.delete(self, entire_dir=True, extra_dir=rel_path, dir_only=True) + except galaxy.exceptions.ObjectNotFound: + pass # TODO: purge metadata files self.deleted = True self.purged = True