Skip to content

Extend dlq_* command line tools to work with RabbitMQ#96

Merged
d-j-hatton merged 45 commits intomasterfrom
rabbitmq-dlq
Oct 11, 2021
Merged

Extend dlq_* command line tools to work with RabbitMQ#96
d-j-hatton merged 45 commits intomasterfrom
rabbitmq-dlq

Conversation

@d-j-hatton
Copy link
Copy Markdown
Contributor

@d-j-hatton d-j-hatton commented Oct 1, 2021

Use the Zocalo site configuration throughout to remove the need for Diamond specific information. A new storage plugin will need to be added to the configuration to hold zocalo.dlq.purge_location where purged messages will be dumped.

I think that all environments should work with the exception of a RabbitMQ test environment for dlq_check as it makes use of the RabbitMQ management API and the relevant credentials.

Also add dlq_check for RabbitMQ to IT health checks.

@d-j-hatton
Extend dlstbx.dlq_check to deal with rabbitmq DLQs if the --rabbitmq …
16740b6 
…flag is set. Makes use of the rabbitmq management API
@d-j-hatton
Fix zocalo configuration import
632bbb2
@d-j-hatton
Modify dlq_purge to accpet transport type as an argument and work wit…
3eac4dc 
…h rabbitmq DLQ naming
@d-j-hatton
Use Zocalo utils for dlq_check ActiveMQ
d4ce3b9
@d-j-hatton
Allow dlq_check to run in environment other than live
447bd3c
@d-j-hatton
Fix last change
93596cf
@d-j-hatton
Try and allow passing a jmx credentials file via command line
55e5206
@d-j-hatton
Don't know if this will work but try and trick the JMX util
5255b90
@d-j-hatton
Partial handling of non-stomp transport for dlq_reinject
67c1259
@d-j-hatton
Add RabbitMQ DLQ check to IT health checks
14161c6
@d-j-hatton
dlq_reinject for RabbitMQ
6bcc481
@d-j-hatton
Use transport option for dlq_check
0efb7e2
@d-j-hatton
Missed default transport assignment
ef106c7
@d-j-hatton
Oops. Removed the wrong option
674e0f0
@d-j-hatton
Use a Zocalo configuration storage option to get the location to dump…
ca7811b 
… DLQ messages to in dlq_purge
@d-j-hatton
Add a few type annotations
aac1e15
@d-j-hatton
If the sight config handles development jmx credentials then that sim…
d0cf27e 
…plifies dlq_check a little
@d-j-hatton
DLQ purge location from Zocalo site configuration
43cae76
@d-j-hatton
Get time message was dead lettered for the RabbitMQ case in dlq_purge
a7792ff
@d-j-hatton
Correct use of receive_dlq_message for RabbitMQ
87dce75
@d-j-hatton
Trying to sort out RabbitMQ headers
90c4796
@d-j-hatton
Add subscription_id for RabbitMQ ack
bb17cb0
@d-j-hatton
Correct for extracted headers that now exist in workflows
09ac940
@d-j-hatton
Properly handle RabbitMQ headers in dlq_reinject
405997d
@d-j-hatton
Clean RabbitMQ header before reinjection
a07ec10
@d-j-hatton
f-strings + comment
043f730
@d-j-hatton d-j-hatton requested a review from Anthchirp October 1, 2021 11:19
@d-j-hatton d-j-hatton mentioned this pull request Oct 1, 2021
Closed
8 tasks
Anthchirp
Anthchirp reviewed Oct 1, 2021
View reviewed changes
@d-j-hatton @Anthchirp
Exit if transport not recognised
f181947 
Co-authored-by: Markus Gerstel <2102431+Anthchirp@users.noreply.github.com>
@d-j-hatton @Anthchirp
Remove sys.exit
38441ef 
Co-authored-by: Markus Gerstel <2102431+Anthchirp@users.noreply.github.com>
rjgildea
rjgildea reviewed Oct 1, 2021
View reviewed changes
rjgildea
rjgildea reviewed Oct 1, 2021
View reviewed changes
d-j-hatton and others added 9 commits October 4, 2021 09:12
@d-j-hatton @rjgildea
Remove commented out import
795d3b7 
Co-authored-by: Richard Gildea <rjgildea@users.noreply.github.com>
@d-j-hatton @rjgildea
Simplify call to subscribe
9e480e0 
Co-authored-by: Richard Gildea <rjgildea@users.noreply.github.com>
@d-j-hatton
Missing quotation mark
137aa07
@d-j-hatton @rjgildea
Use dict comprehension to simplify stripping a reinjected header
b1c50e7 
Co-authored-by: Richard Gildea <rjgildea@users.noreply.github.com>
@d-j-hatton
Make use of Zocalo http_api_request utility
c4a43f7
@d-j-hatton
Collect queue names and DLQ files in named argparser argument
0aa871b
@d-j-hatton @rjgildea
tuple -> set
4e2c419 
Co-authored-by: Richard Gildea <rjgildea@users.noreply.github.com>
@d-j-hatton
transport option now dealt with by workflows
081e8ca
@d-j-hatton
Fix timestamp/datetime conversion for RabbitMQ in dlq_purge
fb83f1d
@d-j-hatton
Copy link
Copy Markdown
Contributor Author

d-j-hatton commented Oct 4, 2021

I've tested these on the RabbitMQ live server and they work except that the ack in dlq_purge crashes complaining with pika.exceptions.ChannelClosedByBroker: (406, 'PRECONDITION_FAILED - unknown delivery tag 1') so either there's a mix up with what the delivery tag should be here or something is going wrong in workflows.

I am nacking the messages directly from http://rabbitmq1.diamond.ac.uk:15672/#/queues/zocalo/transient.destination for testing. Don't know if that causes problems

@d-j-hatton d-j-hatton merged commit 6c10901 into master Oct 11, 2021
@d-j-hatton d-j-hatton deleted the rabbitmq-dlq branch October 11, 2021 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@Anthchirp Anthchirp Anthchirp left review comments

@rjgildea rjgildea rjgildea left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@d-j-hatton @Anthchirp @rjgildea