Skip to content

Do not block indefinitely on the semaphore (backport #1654) #1690

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Nov 24, 2023
Merged

Do not block indefinitely on the semaphore (backport #1654) #1690

merged 2 commits into from
Nov 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 24, 2023

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

On branch mergify/bp/v0.34.x/pr-1654
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 2679498c9.
  (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:
	modified:   mempool/v0/reactor.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   config/config.go
	both modified:   config/toml.go
	both modified:   test/e2e/pkg/manifest.go

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

@lasarojc @mergify
Do not block indefinitely on the semaphore (#1654)
51fbe07 
* Do not block indefinitely on the semaphore

* Cancel the context, irrespective of the flow followed

* Makes the code more readable

* Improving comment

* make linter happy

* Updating comments to match

* Commenting out `select` and leaving it as TODO for when Contexts are more widely used

* Cleaned up comments

(cherry picked from commit 2679498)

# Conflicts:
#	config/config.go
#	config/toml.go
#	test/e2e/pkg/manifest.go
@mergify mergify bot requested a review from a team as a code owner November 24, 2023 10:45
@mergify mergify bot added the conflicts label Nov 24, 2023
@lasarojc lasarojc merged commit 700fcd9 into v0.34.x Nov 24, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.34.x/pr-1654 branch November 24, 2023 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@lasarojc lasarojc lasarojc approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@lasarojc