Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Support out of band dumping of unrooted slots in AccountsDb (backport #17269) #17777

Merged
merged 1 commit into from
Jun 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2021

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

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

You are currently cherry-picking commit bbcdf073b.
  (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:   core/src/repair_service.rs
	modified:   runtime/src/bank.rs

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

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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 7, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 7, 2021

automerge label removed due to a CI failure

* Accounts dumping logic

* Add test for interaction between cache flush and remove_unrooted_slot()

* Update comments

* Rename

* renaming

* Add more comments

* Renaming

* Fixup test and bad check

(cherry picked from commit bbcdf07)
@carllin carllin force-pushed the mergify/bp/v1.7/pr-17269 branch from e6b253d to e47ab55 Compare June 7, 2021 08:08
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 7, 2021
@codecov
Copy link

codecov bot commented Jun 7, 2021

Codecov Report

Merging #17777 (e47ab55) into v1.7 (e5ea16f) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##             v1.7   #17777    +/-   ##
========================================
  Coverage    82.6%    82.6%            
========================================
  Files         432      432            
  Lines      120069   120172   +103     
========================================
+ Hits        99243    99352   +109     
+ Misses      20826    20820     -6     

@mergify mergify bot merged commit fd68b4e into v1.7 Jun 7, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17269 branch June 7, 2021 09:38
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant