Unverified Commit 76f321ee authored by mvdbeek's avatar mvdbeek
Browse files

Only log error if deleting directory really failed 

If we can't look up the directory it's safe to assume it really is gone.
Fixes `None delete error [Errno 39] Directory not empty:
'outputs_populated'`.
parent 316eb5bf

lib/galaxy/objectstore/__init__.py

+6 −1
Original line number Diff line number Diff line
@@ -851,7 +851,12 @@ class DiskObjectStore(ConcreteObjectStore): 
        except OSError as ex:

            # Likely a race condition in which we delete the job working directory

            # and another process writes files into that directory.

            log.critical(f"{self.__get_filename(obj, **kwargs)} delete error {ex}", exc_info=True)

            # If the path doesn't exist anymore, another rmtree call was successful.

            path = self.__get_filename(obj, **kwargs)

            if path is None:

                return True

            else:

                log.critical(f"{path} delete error {ex}", exc_info=True)

        return False



    def _get_data(self, obj, start=0, count=-1, **kwargs):