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-46118: Improve handling of exceptions. #58

Merged
merged 2 commits into from
Oct 4, 2024
Merged

DM-46118: Improve handling of exceptions. #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
060181b
Improve exception handling.
ktlim Sep 6, 2024
27b6e4b
Protect against missing GROUPID header.
ktlim Sep 6, 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
36 changes: 25 additions & 11 deletions src/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,15 @@ def record_groups(resources: list[ResourcePath]) -> None:
instrument = "LSSTCam"
case "latiss":
instrument = "LATISS"
groupid = header["GROUPID"]
snap_number = int(header["CURINDEX"]) - 1
detector = header["RAFTBAY"] + "_" + header["CCDSLOT"]
key = f"GROUP:{instrument}:{groupid}:{snap_number}:{detector}"
pipe.set(key, str(res))
pipe.expire(key, group_lifetime)
if "GROUPID" in header:
groupid = header["GROUPID"]
snap_number = int(header["CURINDEX"]) - 1
detector = header["RAFTBAY"] + "_" + header["CCDSLOT"]
key = f"GROUP:{instrument}:{groupid}:{snap_number}:{detector}"
pipe.set(key, str(res))
pipe.expire(key, group_lifetime)
except Exception:
logger.exception("Error reading group for %s", res)
logger.exception("Error reading snap/detector for %s", res)
pipe.execute()


Expand Down Expand Up @@ -222,17 +223,30 @@ def main():
try:
refs = ingester.run(resources)
except Exception:
logger.exception("Error while ingesting %s", resources)
continue
logger.exception("Error while ingesting %s, retrying one by one", resources)
refs = []
for resource in resources:
try:
refs.append(ingester.run([resource]))
except Exception:
logger.exception("Error while ingesting %s", resource)
info = Info.from_path(resource.geturl())
r.lrem(worker_queue, 0, info.path)

# Define visits if we ingested anything
if not is_lfa and refs:
ids = [ref.dataId for ref in refs]
try:
ids = [ref.dataId for ref in refs]
visit_definer.run(ids, incremental=True)
logger.info("Defined visits for %s", ids)
except Exception:
logger.exception("Error while defining visits for %s", refs)
logger.exception("Error while defining visits for %s, retrying one by one", refs)
for id in ids:
try:
visit_definer.run([id], incremental=True)
logger.info("Defined visit for %s", id)
except Exception:
logger.exception("Error while defining visits for %s", id)
if not is_lfa and rucio_rse:
# Register with Rucio if we ingested anything
try:
Expand Down
Loading