3.13.x only: fix timestamp when recovering x-death header #11608
Conversation
This file contains hidden or 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
This commit fixes a bug present in 3.13.3 which was introduced by #11339 When an AMQP 0.9.1 client re-publishes a message with the x-death header set, the `time` field was not converted from the AMQP 0.9.1 seconds resolution to the internal millisecond resolution of `mc` fields `first_time` and `last_time`. Additionally, this commit will ignore invalid `time` fields sent in the `x-death` header from AMQP 0.9.1 clients as reported in https://rabbitmq.slack.com/archives/C1EDN83PA/p1719986557420719 which results in the following crash later on when the message gets consumed: ``` supervisor: {<0.476725.0>,rabbit_channel_sup} errorContext: child_terminated reason: {badarith, [{erlang,'div', [<<"2024-07-02T02:58:50.000-07:00">>,1000], [{error_info,#{module => erl_erts_errors}}]}, {mc_amqpl,death_table,7,[{file,"mc_amqpl.erl"},{line,806}]}, {lists,map,2,[{file,"lists.erl"},{line,1559}]}, {mc_amqpl,deaths_to_headers,2, [{file,"mc_amqpl.erl"},{line,764}]}, {mc_amqpl,protocol_state,2, [{file,"mc_amqpl.erl"},{line,406}]}, {rabbit_channel,handle_deliver0,4, [{file,"rabbit_channel.erl"},{line,2685}]}, {lists,foldl,3,[{file,"lists.erl"},{line,1594}]}, {rabbit_channel,handle_cast,2, [{file,"rabbit_channel.erl"},{line,732}]}]} ```
michaelklishin
added
the
backport-pending
Collaborator
|
This can be merged after Tanzu RabbitMQ |
michaelklishin
changed the title
michaelklishin
changed the title
michaelklishin
changed the title
michaelklishin
approved these changes
Jul 4, 2024
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 fixes a bug present in 3.13.3 which was introduced by #11339
When an AMQP 0.9.1 client re-publishes a message with the x-death header set, the
timefield was not converted from the AMQP 0.9.1 seconds resolution to the internal millisecond resolution ofmcfieldsfirst_timeandlast_time.Additionally, this commit will ignore invalid
timefields sent in thex-deathheader from AMQP 0.9.1 clients as reported in https://rabbitmq.slack.com/archives/C1EDN83PA/p1719986557420719 which results in the following crash later on when the message gets consumed: