Unverified Commit c2140bd0 authored by mvdbeek's avatar mvdbeek
Browse files

Avoid flush in set_meta by using MetadataFile.uuid

parent badbd3ae

lib/galaxy/model/deferred.py

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ class DatasetInstanceMaterializer: 
            if transient_paths:

                metadata_tmp_files_dir = transient_paths.metadata_files_dir

            else:

                # If metadata_tmp_files_dir is set we generate a MetdataTempFile,

                # If metadata_tmp_files_dir is set we generate a MetadataTempFile,

                # which we don't want when we're generating an attached materialized dataset instance

                metadata_tmp_files_dir = None

            materialized_dataset_instance.set_meta(metadata_tmp_files_dir=metadata_tmp_files_dir)

lib/galaxy/model/metadata.py

+2 −4
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ class FileParameter(MetadataParameter): 
                # directory. Correct.

                file_name = path_rewriter(file_name)

            mf.update_from_file(file_name)

            value = mf.id

            value = str(mf.uuid)

        return value



    def to_external_value(self, value):
@@ -692,11 +692,9 @@ class FileParameter(MetadataParameter): 
            sa_session = object_session(dataset)

            if sa_session:

                sa_session.add(mf)

                with transaction(sa_session):

                    sa_session.commit()  # commit to assign id

            return mf

        else:

            # we need to make a tmp file that is accessable to the head node,

            # we need to make a tmp file that is accessible to the head node,

            # we will be copying its contents into the MetadataFile objects filename after restoring from JSON

            # we do not include 'dataset' in the kwds passed, as from_JSON_value() will handle this for us

            return MetadataTempFile(metadata_tmp_files_dir=metadata_tmp_files_dir, **kwds)