Unverified Commit cd2f1f8b authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18681 from mvdbeek/set_file_size_then_delete 

[24.0] Make sure we set file size also for purged outputs
parents b48a49fc c71f9440

lib/galaxy/jobs/__init__.py

+5 −5
Original line number Diff line number Diff line
@@ -2001,13 +2001,13 @@ class MinimalJobWrapper(HasResourceParameters): 
        # Once datasets are collected, set the total dataset size (includes extra files)

        for dataset_assoc in job.output_datasets:

            dataset = dataset_assoc.dataset.dataset

            if not dataset.purged:

            # assume all datasets in a job get written to the same objectstore

            quota_source_info = dataset.quota_source_info

            collected_bytes += dataset.set_total_size()

            else:

            if dataset.purged:

                # Purge, in case job wrote directly to object store

                dataset.full_delete()

                collected_bytes = 0



        user = job.user

        if user and collected_bytes > 0 and quota_source_info is not None and quota_source_info.use:

lib/galaxy/model/store/__init__.py

+3 −3
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ class ModelImportStore(metaclass=abc.ABCMeta): 
                                assert file_source_root

                                dataset_extra_files_path = os.path.join(file_source_root, dataset_extra_files_path)

                                persist_extra_files(self.object_store, dataset_extra_files_path, dataset_instance)

                            # Don't trust serialized file size

                            # Only trust file size if the dataset is purged. If we keep the data we should check the file size.

                            dataset_instance.dataset.file_size = None

                            dataset_instance.dataset.set_total_size()  # update the filesize record in the database