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

v1.17: Initialize fork graph in program cache during bank_forks creation (backport of #33810) #33817

Merged
merged 2 commits into from
Oct 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 23, 2023

This is an automatic backport of pull request #33810 done by Mergify.
Cherry-pick of 9d42cd7 has failed:

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

You are currently cherry-picking commit 9d42cd7efe.
  (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:   banking-bench/src/main.rs
	modified:   banks-client/src/lib.rs
	modified:   client-test/tests/client.rs
	modified:   core/benches/banking_stage.rs
	modified:   core/benches/consensus.rs
	modified:   core/src/banking_stage.rs
	modified:   core/src/banking_stage/consume_worker.rs
	modified:   core/src/banking_stage/forward_worker.rs
	modified:   core/src/banking_stage/forwarder.rs
	modified:   core/src/cluster_info_vote_listener.rs
	modified:   core/src/commitment_service.rs
	modified:   core/src/consensus/heaviest_subtree_fork_choice.rs
	modified:   core/src/repair/ancestor_hashes_service.rs
	modified:   core/src/repair/quic_endpoint.rs
	modified:   core/src/repair/serve_repair.rs
	modified:   core/src/replay_stage.rs
	modified:   core/src/tvu.rs
	modified:   core/src/validator.rs
	modified:   core/src/vote_simulator.rs
	modified:   core/tests/snapshots.rs
	modified:   gossip/src/duplicate_shred_handler.rs
	modified:   gossip/tests/gossip.rs
	modified:   ledger/src/bank_forks_utils.rs
	modified:   program-runtime/src/loaded_programs.rs
	modified:   program-test/src/lib.rs
	modified:   rpc/src/optimistically_confirmed_bank_tracker.rs
	modified:   rpc/src/rpc.rs
	modified:   rpc/src/rpc_health.rs
	modified:   rpc/src/rpc_pubsub.rs
	modified:   rpc/src/rpc_pubsub_service.rs
	modified:   rpc/src/rpc_subscription_tracker.rs
	modified:   rpc/src/rpc_subscriptions.rs
	modified:   runtime/benches/prioritization_fee_cache.rs
	modified:   runtime/src/bank_forks.rs
	modified:   runtime/src/prioritization_fee_cache.rs
	modified:   runtime/src/root_bank_cache.rs
	modified:   send-transaction-service/src/send_transaction_service.rs
	modified:   turbine/benches/cluster_info.rs
	modified:   turbine/benches/retransmit_stage.rs
	modified:   turbine/src/broadcast_stage.rs
	modified:   turbine/src/broadcast_stage/standard_broadcast_run.rs
	modified:   turbine/src/quic_endpoint.rs
	modified:   turbine/src/sigverify_shreds.rs
	modified:   validator/src/admin_rpc_service.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/repair/repair_service.rs
	both modified:   core/tests/epoch_accounts_hash.rs
	both modified:   ledger/src/blockstore_processor.rs
	both modified:   rpc/src/rpc_service.rs
	both modified:   runtime/src/bank/tests.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

…33810)

* Initialize fork graph in program cache during bank_forks creation

* rename BankForks::new to BankForks::new_rw_arc

* fix compilation

* no need to set fork_graph on insert()

* fix partition tests

(cherry picked from commit 9d42cd7)

# Conflicts:
#	core/src/repair/repair_service.rs
#	core/tests/epoch_accounts_hash.rs
#	ledger/src/blockstore_processor.rs
#	rpc/src/rpc_service.rs
#	runtime/src/bank/tests.rs
@mergify mergify bot added the conflicts label Oct 23, 2023
@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Merging #33817 (a186c5c) into v1.17 (a186c5c) will not change coverage.
The diff coverage is n/a.

❗ Current head a186c5c differs from pull request most recent head ee0fb66. Consider uploading reports for the commit ee0fb66 to get more accurate results

@@           Coverage Diff           @@
##            v1.17   #33817   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         804      804           
  Lines      217637   217637           
=======================================
  Hits       178143   178143           
  Misses      39494    39494           

@pgarg66 pgarg66 requested a review from Lichtso October 23, 2023 17:52
@pgarg66 pgarg66 added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Oct 23, 2023
@mergify mergify bot merged commit 22f44d0 into v1.17 Oct 23, 2023
31 checks passed
@mergify mergify bot deleted the mergify/bp/v1.17/pr-33810 branch October 23, 2023 18:28
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…ion (backport of solana-labs#33810) (solana-labs#33817)

* Initialize fork graph in program cache during bank_forks creation (solana-labs#33810)

* Initialize fork graph in program cache during bank_forks creation

* rename BankForks::new to BankForks::new_rw_arc

* fix compilation

* no need to set fork_graph on insert()

* fix partition tests

(cherry picked from commit 9d42cd7)

# Conflicts:
#	core/src/repair/repair_service.rs
#	core/tests/epoch_accounts_hash.rs
#	ledger/src/blockstore_processor.rs
#	rpc/src/rpc_service.rs
#	runtime/src/bank/tests.rs

* fix merge conflicts

---------

Co-authored-by: Pankaj Garg <pankaj@solana.com>
anwayde pushed a commit to firedancer-io/solana that referenced this pull request Nov 16, 2023
…ion (backport of solana-labs#33810) (solana-labs#33817)

* Initialize fork graph in program cache during bank_forks creation (solana-labs#33810)

* Initialize fork graph in program cache during bank_forks creation

* rename BankForks::new to BankForks::new_rw_arc

* fix compilation

* no need to set fork_graph on insert()

* fix partition tests

(cherry picked from commit 9d42cd7)

# Conflicts:
#	core/src/repair/repair_service.rs
#	core/tests/epoch_accounts_hash.rs
#	ledger/src/blockstore_processor.rs
#	rpc/src/rpc_service.rs
#	runtime/src/bank/tests.rs

* fix merge conflicts

---------

Co-authored-by: Pankaj Garg <pankaj@solana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants