Skip to content

Reorder job queues declaration sequence to ensure job progress and status queues can be properly cleaned up #83

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

Merged
cwang39403 merged 1 commit into from
Nov 12, 2024
Merged

Reorder job queues declaration sequence to ensure job progress and status queues can be properly cleaned up #83

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/omotes_sdk/omotes_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,6 @@ def connect_to_submitted_job(
auto_disconnect_handler,
)

self.broker_if.declare_queue_and_add_subscription(
queue_name=job_results_queue_name,
callback_on_message=callback_handler.callback_on_finished_wrapped,
queue_type=AMQPQueueType.DURABLE,
exchange_name=OmotesQueueNames.omotes_exchange_name(),
delete_after_messages=1,
queue_ttl=job_queue_ttl,
)
if callback_on_progress_update:
self.broker_if.declare_queue_and_add_subscription(
queue_name=job_progress_queue_name,
Expand All @@ -287,6 +279,17 @@ def connect_to_submitted_job(
exchange_name=OmotesQueueNames.omotes_exchange_name(),
queue_ttl=job_queue_ttl,
)
# Declares the job result queue last to ensure the job progress
# and status queues are already declared and exist. This order allows
# them to be properly removed by _autodelete_progres_status_queues_on_result()
self.broker_if.declare_queue_and_add_subscription(
queue_name=job_results_queue_name,
callback_on_message=callback_handler.callback_on_finished_wrapped,
queue_type=AMQPQueueType.DURABLE,
exchange_name=OmotesQueueNames.omotes_exchange_name(),
delete_after_messages=1,
queue_ttl=job_queue_ttl,
)

def submit_job(
self,
Expand Down