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-27478: Add direct transfer option to butler ingest-raws #328

Merged
merged 2 commits into from
Nov 18, 2020
Merged

DM-27478: Add direct transfer option to butler ingest-raws #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db93b88
Add direct transfer option to butler ingest-raws
timj Nov 16, 2020
e8cad1f
Formatter.write no longer returns anything so remove the return
timj Nov 16, 2020
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
6 changes: 0 additions & 6 deletions python/lsst/obs/base/formatters/fitsExposure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,6 @@ def write(self, inMemoryDataset):
----------
inMemoryDataset : `object`
The Python object to store.

Returns
-------
path : `str`
The `URI` where the primary file is stored.
"""
# Update the location with the formatter-preferred file extension
self.fileDescriptor.location.updateExtension(self.extension)
Expand All @@ -297,7 +292,6 @@ def write(self, inMemoryDataset):
inMemoryDataset.writeFitsWithOptions(outputPath, options=ps)
else:
inMemoryDataset.writeFits(outputPath)
return self.fileDescriptor.location.pathInStore

def getImageCompressionSettings(self, recipeName):
"""Retrieve the relevant compression settings for this recipe.
Expand Down
1 change: 1 addition & 0 deletions python/lsst/obs/base/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ def makeTransferChoiceField(doc="How to transfer files (None for no transfer).",
allowed={"move": "move",
"copy": "copy",
"auto": "choice will depend on datastore",
"direct": "use URI to ingested file directly in datastore",
"link": "hard link falling back to symbolic link",
"hardlink": "hard link",
"symlink": "symbolic (soft) link",
Expand Down
21 changes: 18 additions & 3 deletions python/lsst/obs/base/ingest_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import shutil

import lsst.afw.cameraGeom
from lsst.daf.butler import Butler
from lsst.daf.butler import Butler, ButlerURI
from lsst.daf.butler.cli.butler import cli as butlerCli
from lsst.daf.butler.cli.utils import LogCliRunner
import lsst.obs.base
Expand Down Expand Up @@ -146,8 +146,13 @@ def verifyIngest(self, files=None, cli=False, fullCheck=False):
This only really affects files that contain multiple datasets.
"""
butler = Butler(self.root, run=self.outputRun)
datasets = butler.registry.queryDatasets("raw", collections=self.outputRun)
self.assertEqual(len(list(datasets)), len(self.dataIds))
datasets = list(butler.registry.queryDatasets("raw", collections=self.outputRun))
self.assertEqual(len(datasets), len(self.dataIds))

# Get the URI to the first dataset and check it is inside the
# datastore
datasetUri = butler.getURI(datasets[0])
self.assertIsNotNone(datasetUri.relative_to(butler.datastore.root))

for dataId in self.dataIds:
# Check that we can read metadata from a raw
Expand Down Expand Up @@ -236,6 +241,16 @@ def testSymLink(self):
self._ingestRaws(transfer="symlink")
self.verifyIngest()

def testDirect(self):
self._ingestRaws(transfer="direct")

# Check that it really did have a URI outside of datastore
srcUri = ButlerURI(self.file)
butler = Butler(self.root, run=self.outputRun)
datasets = list(butler.registry.queryDatasets("raw", collections=self.outputRun))
datastoreUri = butler.getURI(datasets[0])
self.assertEqual(datastoreUri, srcUri)

def testCopy(self):
self._ingestRaws(transfer="copy")
# Only test full read of raws for the copy test. No need to do it
Expand Down