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

DM-46690: Fix one-by-one ingestion in exception handling. #59

Merged
merged 2 commits into from
Oct 7, 2024
Merged

DM-46690: Fix one-by-one ingestion in exception handling. #59

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
9a1d924
Fix one-by-one ingestion.
ktlim Oct 7, 2024
6a8a7a3
Bump weekly and rubin-env.
ktlim Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile.ingest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

# Dockerfile for ingest service.

ARG RUBINENV_VERSION=8.0.0
FROM lsstsqre/newinstall:${RUBINENV_VERSION}
ARG RUBINENV_VERSION=9.0.0
FROM ghcr.io/lsst-dm/docker-newinstall:9-latest-${RUBINENV_VERSION}
ARG OBS_LSST_VERSION
ENV OBS_LSST_VERSION=${OBS_LSST_VERSION:-w_2024_24}
ENV OBS_LSST_VERSION=${OBS_LSST_VERSION:-w_2024_40}
USER lsst
RUN source loadLSST.bash && mamba install redis-py rucio-clients
RUN source loadLSST.bash && mamba install redis-py
RUN source loadLSST.bash && eups distrib install -t "${OBS_LSST_VERSION}" lsst_obs
COPY src/ingest.py src/info.py src/utils.py src/rucio_interface.py ./ingest/
# Environment variables that must be set:
Expand Down
2 changes: 1 addition & 1 deletion src/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def main():
refs = []
for resource in resources:
try:
refs.append(ingester.run([resource]))
refs.extend(ingester.run([resource]))
except Exception:
logger.exception("Error while ingesting %s", resource)
info = Info.from_path(resource.geturl())
Expand Down
Loading