Skip to content

Make sure temporary stream output queues get deleted, make all queues used by the stream service auto deletable #3746

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
merged 2 commits into from
Sep 15, 2017
Merged

Make sure temporary stream output queues get deleted, make all queues used by the stream service auto deletable #3746

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
a0f9d71
Make output queues exclusive and auto deleteable.
Kami Sep 15, 2017
dc8c6e5
Make all queues used by stream service auto_delete=True.
Kami Sep 15, 2017
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
5 changes: 3 additions & 2 deletions st2common/st2common/transport/announcement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,6 @@ def dispatch(self, routing_key, payload, trace_context=None):
self._publisher.publish(payload=payload, routing_key=routing_key)


def get_queue(name=None, routing_key='#', exclusive=False):
return Queue(name, ANNOUNCEMENT_XCHG, routing_key=routing_key, exclusive=exclusive)
def get_queue(name=None, routing_key='#', exclusive=False, auto_delete=False):
return Queue(name, ANNOUNCEMENT_XCHG, routing_key=routing_key, exclusive=exclusive,
auto_delete=auto_delete)
10 changes: 6 additions & 4 deletions st2common/st2common/transport/execution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ def __init__(self, urls):
super(ActionExecutionOutputPublisher, self).__init__(urls, EXECUTION_OUTPUT_XCHG)


def get_queue(name=None, routing_key=None, exclusive=False):
return Queue(name, EXECUTION_XCHG, routing_key=routing_key, exclusive=exclusive)
def get_queue(name=None, routing_key=None, exclusive=False, auto_delete=False):
return Queue(name, EXECUTION_XCHG, routing_key=routing_key, exclusive=exclusive,
auto_delete=auto_delete)


def get_output_queue(name=None, routing_key=None, exclusive=False):
return Queue(name, EXECUTION_OUTPUT_XCHG, routing_key=routing_key, exclusive=exclusive)
def get_output_queue(name=None, routing_key=None, exclusive=False, auto_delete=False):
return Queue(name, EXECUTION_OUTPUT_XCHG, routing_key=routing_key, exclusive=exclusive,
auto_delete=auto_delete)
16 changes: 11 additions & 5 deletions st2common/st2common/transport/queues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,21 @@

# Used by the stream service
STREAM_ANNOUNCEMENT_WORK_QUEUE = announcement.get_queue(routing_key=publishers.ANY_RK,
exclusive=True)
exclusive=True,
auto_delete=True)
STREAM_EXECUTION_ALL_WORK_QUEUE = execution.get_queue(routing_key=publishers.ANY_RK,
exclusive=True)
exclusive=True,
auto_delete=True)
STREAM_EXECUTION_UPDATE_WORK_QUEUE = execution.get_queue(routing_key=publishers.UPDATE_RK,
exclusive=True)
exclusive=True,
auto_delete=True)
STREAM_LIVEACTION_WORK_QUEUE = Queue(None, liveaction.LIVEACTION_XCHG,
routing_key=publishers.ANY_RK, exclusive=True)
routing_key=publishers.ANY_RK,
exclusive=True, auto_delete=True)

# TODO: Perhaps we should use pack.action name as routing key so we can do more efficient filtering
# later, if needed
STREAM_EXECUTION_OUTPUT_QUEUE = execution.get_output_queue(name=None,
routing_key=publishers.CREATE_RK)
routing_key=publishers.CREATE_RK,
exclusive=True,
auto_delete=True)