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

v1.16: Adds --no-skip-initial-accounts-db-clean *hidden* CLI flag (backport of #33664) #33676

Merged
merged 2 commits into from
Oct 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 12, 2023

This is an automatic backport of pull request #33664 done by Mergify.
Cherry-pick of 452fd5d has failed:

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

You are currently cherry-picking commit 452fd5d384.
  (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/validator.rs
	modified:   core/tests/epoch_accounts_hash.rs
	modified:   core/tests/snapshots.rs
	modified:   ledger/src/bank_forks_utils.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   local-cluster/src/validator_configs.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/bank/tests.rs
	modified:   validator/src/cli.rs
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   runtime/src/bank/serde_snapshot.rs
	deleted by us:   runtime/src/snapshot_bank_utils.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

(cherry picked from commit 452fd5d)

# Conflicts:
#	runtime/src/bank/serde_snapshot.rs
#	runtime/src/snapshot_bank_utils.rs
@brooksprumo
Copy link
Contributor

This PR adds a mitigation for the OOM that some nodes (with 128 GB of RAM) are experiencing on v1.16.

@codecov
Copy link

codecov bot commented Oct 12, 2023

Codecov Report

Merging #33676 (8606fa1) into v1.16 (29abc02) will decrease coverage by 0.1%.
The diff coverage is 54.5%.

@@            Coverage Diff            @@
##            v1.16   #33676     +/-   ##
=========================================
- Coverage    81.8%    81.8%   -0.1%     
=========================================
  Files         766      766             
  Lines      209084   209091      +7     
=========================================
- Hits       171196   171138     -58     
- Misses      37888    37953     +65     

@brooksprumo brooksprumo merged commit 26fc045 into v1.16 Oct 12, 2023
@brooksprumo brooksprumo deleted the mergify/bp/v1.16/pr-33664 branch October 12, 2023 20:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants