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.

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

Fix channel crash when draining AMQP 1.0 credits from classic queue (backport #7141) #7153

Merged
merged 3 commits into from Feb 2, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 2, 2023

This is an automatic backport of pull request #7141 done by Mergify.
Cherry-pick of 3bb3273 has failed:

On branch mergify/bp/v3.11.x/pr-7141
Your branch is up to date with 'origin/v3.11.x'.

You are currently cherry-picking commit 3bb32737ee.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deps/amqp10_client/src/amqp10_client.erl
	modified:   deps/amqp10_client/src/amqp10_client_session.erl
	modified:   deps/rabbit/src/rabbit_queue_consumers.erl
	modified:   deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_outgoing_link.erl
	modified:   deps/rabbitmq_amqp1_0/test/amqp10_client_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_channel.erl
	both modified:   deps/rabbit/src/rabbit_classic_queue.erl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Classic queues used a different format for the `{send_drained, _}`
queue type action which was missed originally. This change handles both
formats in the channel for backwards compatibility
 as well as changes classic queues to conform to the same format when
sending the queue event.

Whilst adding tests for this in the amqp10 plugin another issue around
the amqp10_client and filters was discovered and this commit also includes
improvements in this area. Such as more leninet support of source filters.

(cherry picked from commit 3bb3273)

# Conflicts:
#	deps/rabbit/src/rabbit_channel.erl
#	deps/rabbit/src/rabbit_classic_queue.erl
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants