Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-16227: Remove workaround for bad transaction nesting in Registry. #128

Merged
merged 1 commit into from
Jan 25, 2019
Merged

DM-16227: Remove workaround for bad transaction nesting in Registry. #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 1 addition & 8 deletions python/lsst/obs/base/gen3/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,7 @@ def ingestFile(self, file, headers, dataId, run=None):

# Add a Dataset entry to the Registry.
try:
# We use transactional=False here (a kwarg added by the
# @transactional decorator) to keep the conflict exception from
# starting a higher-level rollback - if we catch this exception,
# we don't want to have already started rolling back the ingest of
# *previous* files when config.onError=='rollback' but
# config.confict=='ignore'.
ref = self.butler.registry.addDataset(self.datasetType, dataId, run=run,
transactional=False, recursive=True)
ref = self.butler.registry.addDataset(self.datasetType, dataId, run=run, recursive=True)
except ValueError:
raise IngestConflictError("Ingest conflict on {} {}".format(file, dataId))

Expand Down