Remove BCC from x-death routing-keys (backport #11230) #11232
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
This commit is a follow up of #11174 which broke the following Java client test: ``` ./mvnw verify -P '!setup-test-cluster' -Drabbitmqctl.bin=DOCKER:rabbitmq -Dit.test=DeadLetterExchange#deadLetterNewRK ``` The desired documented behaviour is the following: > routing-keys: the routing keys (including CC keys but excluding BCC ones) the message was published with This behaviour should be respected also for messages dead lettered into a stream. Therefore, instead of first including the BCC keys in the `#death.routing_keys` field and removing it again in mc_amqpl before sending the routing-keys to the client as done in v3.13.2 in https://github.com/rabbitmq/rabbitmq-server/blob/dc25ef53292eb0b34588ab8eaae61082b966b784/deps/rabbit/src/mc_amqpl.erl#L527 we instead omit directly the BCC keys from `#death.routing_keys` when recording a death event. This commit records the BCC keys in their own mc `bcc` annotation in `mc_amqpl:init/1`. (cherry picked from commit 90a4010)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit is a follow up of #11174 which broke the following Java client test:
The desired documented behaviour is the following:
This behaviour should be respected also for messages dead lettered into a stream. Therefore, instead of first including the BCC keys in the
#death.routing_keysfield and removing it again in mc_amqpl before sending the routing-keys to the client as done in v3.13.2 inrabbitmq-server/deps/rabbit/src/mc_amqpl.erl
Line 527 in dc25ef5
#death.routing_keyswhen recording a death event.This commit records the BCC keys in their own mc
bccannotation inmc_amqpl:init/1.This is an automatic backport of pull request #11230 done by Mergify.