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

clean race condition with extra unref (backport #27682) #27802

Merged
merged 3 commits into from
Sep 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 15, 2022

This is an automatic backport of pull request #27682 done by Mergify.
Cherry-pick of 1811d68 has failed:

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

You are currently cherry-picking commit 1811d684b.
  (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:   runtime/src/snapshot_minimizer.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/accounts_db.rs
	both modified:   runtime/src/accounts_index.rs
	both modified:   runtime/src/in_mem_accounts_index.rs

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

* clean race condition with extra unref

* clarify comment

* fix test

* cleanup test

* clippy

(cherry picked from commit 1811d68)

# Conflicts:
#	runtime/src/accounts_db.rs
#	runtime/src/accounts_index.rs
#	runtime/src/in_mem_accounts_index.rs
@mergify mergify bot added the conflicts label Sep 15, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Sep 15, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Sep 15, 2022

automerge label removed due to a CI failure

@jeffwashington jeffwashington added the no-automerge Prevent the automerge label from being applied label Sep 15, 2022
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.14/pr-27682 branch from e59f480 to 0ed7cf4 Compare September 15, 2022 16:26
@jeffwashington jeffwashington merged commit c3182e1 into v1.14 Sep 15, 2022
@jeffwashington jeffwashington deleted the mergify/bp/v1.14/pr-27682 branch September 15, 2022 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts no-automerge Prevent the automerge label from being applied
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant