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

Prevent node monitor crashing from doing multiple node disconnects in unstable networks (backport #9663) (backport #9667) #9668

Merged
merged 4 commits into from
Oct 9, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 9, 2023

This is an automatic backport of pull request #9667 done by Mergify.
Cherry-pick of 864ec12 has failed:

On branch mergify/bp/v3.11.x/pr-9667
Your branch is ahead of 'origin/v3.11.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 864ec125a3.
  (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/rabbit/src/rabbit_node_monitor.erl

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

Cherry-pick of c55b431 has failed:

On branch mergify/bp/v3.11.x/pr-9667
Your branch is ahead of 'origin/v3.11.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c55b431345.
  (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/rabbit/src/rabbit_node_monitor.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

when nodes are already disconnected, thus preventing
application controller timeouts and node monitor terminations,
which in some cases fails to receover completely.

(cherry picked from commit 7ce9d86)
(cherry picked from commit 0e57d92)
(cherry picked from commit bc1af7c)
(cherry picked from commit 864ec12)

# Conflicts:
#	deps/rabbit/src/rabbit_node_monitor.erl
(cherry picked from commit 6e5ad7d)
(cherry picked from commit c55b431)

# Conflicts:
#	deps/rabbit/src/rabbit_node_monitor.erl
@mergify mergify bot added the conflicts label Oct 9, 2023
@michaelklishin michaelklishin added this to the 3.11.24 milestone Oct 9, 2023
@michaelklishin michaelklishin merged commit 2c100b7 into v3.11.x Oct 9, 2023
10 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-9667 branch October 9, 2023 23:41
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.

2 participants