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

Do not confirm MQTT messages if in partition (backport #9523) #9530

Merged
merged 2 commits into from
Sep 26, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 26, 2023

This is an automatic backport of pull request #9523 done by Mergify.
Cherry-pick of d8ecc66 has failed:

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

You are currently cherry-picking commit d8ecc66a8e.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

Since MQTT publishers might publish to classic mirrored queues,
add the same check as in rabbit_channel:send_confirms_and_nacks/1:

```
If we are in a minority and pause_minority mode then a) we are
going to shut down imminently and b) we should not confirm anything
until then, since anything we confirm is likely to be lost.
```

(cherry picked from commit d8ecc66)

# Conflicts:
#	deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl
@mergify mergify bot added the conflicts label Sep 26, 2023
@mergify mergify bot assigned ansd Sep 26, 2023
@ansd ansd merged commit a4161a7 into v3.12.x Sep 26, 2023
@ansd ansd deleted the mergify/bp/v3.12.x/pr-9523 branch September 26, 2023 07:45
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.

1 participant