Skip to content
Snippets Groups Projects

Fixing post-ingestion message error

Merged Fixing post-ingestion message error
ingest_obs_aat_message into main
2 unresolved threads
Merged Daniel Nemergut requested to merge ingest_obs_aat_message into main
2 unresolved threads

Sending an ingestion-complete.vlba message to AAT when an observation ingestion was successful. The default img-ingestion-complete message required a requestId parameter which ingest_obs workflows don't have and they would've kicked off the wrong indexer.

More work will be done on the AAT side in the future which may warrant some changes here.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
shared/workspaces/workspaces/workflow/services/workflow_service.py
318 318 elif msg_type == "img-ingestion-complete":
319 319 logger.info(f"Sending 'Image Ingestion Complete' indexing message to AAT for project {project_code}!")
320 320 msg_arch = ArchiveMessageArchitect(routing_key="ingestor.images", request=None, project_code=project_code)
321 elif msg_type == "obs-ingestion-complete":
322 logger.info(f"Sending 'Observation Ingestion Complete' indexing message to AAT for project {project_code}!")
323 msg_arch = ArchiveMessageArchitect(
  • Daniel Nemergut added 1 commit

    added 1 commit

    • 1c8ad2d2 - Preventing the architect from falling over if a request isn't attached

    Compare with previous version

  • Daniel Nemergut added 2 commits

    added 2 commits

    • 7308afa3 - Fixed subject to be more specific about the key
    • ba0f323c - Added a message template for obs-ingestion-complete messages

    Compare with previous version

  • Daniel Nemergut
    Daniel Nemergut @dnemergu started a thread on the diff
    • shared/workspaces/workspaces/workflow/message_architect.py
    120 120 "status": "complete",
    121 121 },
    122 122 },
    123 "obs_ingestion_complete": {
    124 "application": "ingestor",
    125 "message": "Observation Ingestion Complete",
    126 "request": "observation",
    • Daniel Nemergut
      Daniel Nemergut @dnemergu ·
      Author Owner

      Wasn't sure if the message and request values matter. The examples in the archive have them as 'message': 'fitsaips import' and 'request': 're-index please', so I thought maybe they don't matter.

    • J
      Jim Sheckard @jsheckar ·
      Owner

      If they're in the other templates, it's probably best to follow suit. They were either necessary to have not-blank or set as a preventive measure.

    • J
      Jim Sheckard @jsheckar ·
      Owner

      As we refine more of the AAT systems, the templates can be refactored to something a bit closer to WS.

    • Please register or sign in to reply
  • Charlotte Hausman approved this merge request

    approved this merge request

  • Jim Sheckard approved this merge request

    approved this merge request

  • Daniel Nemergut enabled an automatic merge when the pipeline for ba0f323c succeeds

    enabled an automatic merge when the pipeline for ba0f323c succeeds

  • Daniel Nemergut merged

    merged

  • Daniel Nemergut mentioned in commit 9c7db06b

    mentioned in commit 9c7db06b

    • Please register or sign in to reply