Skip to content

fix(p2p/pex): gracefully shutdown Reactor (backport #2010)#2244

Merged
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-2010
Feb 6, 2024
Merged

fix(p2p/pex): gracefully shutdown Reactor (backport #2010)#2244
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-2010

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2024

This is an automatic backport of pull request #2010 done by Mergify.
Cherry-pick of 8a0a2f6 has failed:

On branch mergify/bp/v1.x/pr-2010
Your branch is up to date with 'origin/v1.x'.

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

Changes to be committed:
	new file:   .changelog/unreleased/bug-fixes/2010-p2p-pex-shutdown.md
	modified:   p2p/pex/addrbook.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   p2p/pex/pex_reactor.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

Closes #646,
#652

<!--

Please add a reference to the issue that this PR addresses and indicate
which
files are most critical to review. If it fully addresses a particular
issue,
please include "Closes #XXX" (where "XXX" is the issue number).

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

---

#### PR checklist

- [ ] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] ~~Updated relevant documentation (`docs/` or `spec/`) and code
comments~~

(cherry picked from commit 8a0a2f6)

# Conflicts:
#	p2p/pex/pex_reactor.go
@mergify mergify bot requested a review from a team as a code owner February 6, 2024 03:44
@mergify mergify bot added the conflicts label Feb 6, 2024
@mergify mergify bot requested a review from a team February 6, 2024 03:44
@melekes melekes merged commit 3d943bd into v1.x Feb 6, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-2010 branch February 6, 2024 05:49
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.

2 participants