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

v2.1: Fixes clean_old_storages_with_reclaims tests (backport of #4147) #4165

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 18, 2024

Problem

The two accounts-db clean_old_storages_with_reclaims tests incorrectly set up the dirty stores/uncleaned pubkeys to test out the desired clean situations. This is because uncleaned_roots is used, but this struct is not responsible for deciding which slots to load as clean candidates.

Summary of Changes

Fixes the tests to not use uncleaned_roots.

Justification to Backport

We added (and backported) code and tests for fixing some accounts-db clean issues. There seems to still be an accounts-db clean issue that RPC nodes have been hitting. If we find, fix, and backport that issue, I'd like to have the current clean tests be correct. This backport PR fixes those tests.


This is an automatic backport of pull request #4147 done by [Mergify](https://mergify.com).

(cherry picked from commit 4eabeed)

# Conflicts:
#	accounts-db/src/accounts_db/tests.rs
@mergify mergify bot requested a review from a team as a code owner December 18, 2024 15:18
@mergify mergify bot added the conflicts label Dec 18, 2024
Copy link
Author

mergify bot commented Dec 18, 2024

Cherry-pick of 4eabeed has failed:

On branch mergify/bp/v2.1/pr-4147
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit 4eabeedaa.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   accounts-db/src/accounts_db/tests.rs

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@brooksprumo brooksprumo requested a review from HaoranYi December 18, 2024 17:05
Copy link

@HaoranYi HaoranYi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm.

@brooksprumo brooksprumo merged commit fa16029 into v2.1 Dec 18, 2024
28 checks passed
@brooksprumo brooksprumo deleted the mergify/bp/v2.1/pr-4147 branch December 18, 2024 19:05
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.

3 participants