Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 1, 2022

This is an automatic backport of pull request #6292 done by Mergify.


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

The commit in f15e2e4 that effectively maps
the modified outcome to accepted is not correct. Modified is a lot more
like the released outcome. This commit refines the behaviour of the modified
in the following ways:

1. A modified outcome with delivery_failed=true, undeliverable_here=false|undefined
will be rejected with requeue=true;
2. Any other modified outcome will be rejected with requeue=false.

It is worth noting that this isn't completely correct but probably the closest
approximation we can achieve at the moment.

The undeliverable_here field refers to the current link, not the message itself but
as we have no means of filtering which messages get assigned to which consumer links
we instead avoid requeuing it.

Also the case where delivery_failed=false|undefined requires the release of the message
_without_ incrementing the delivery_count. Again this is not something that our queues
are able to do so again we have to reject without requeue.

(cherry picked from commit d5cd977)
@michaelklishin michaelklishin merged commit 16159b7 into v3.11.x Nov 1, 2022
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-6292 branch November 1, 2022 14:06
michaelklishin added a commit that referenced this pull request Nov 1, 2022
Refine and fix AMQP 1.0 modified outcome behaviour (backport #6292) (backport #6299)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants