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.0: Scheduler: Improve TTL (backport of #3161) #3179

Merged
merged 2 commits into from
Oct 17, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 15, 2024

Problem

  • Scheduler tracks the end of epoch slot so that transactions are re-sanitized if the epoch rolls over
  • Does not tell us when ALTs may expire

Summary of Changes

  • track when ALTs expire to avoid re-checking ALT resolution every time
  • re-resolve if the ALT expiration is hit

Fixes #


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

Co-authored-by: Justin Starry <[email protected]>
(cherry picked from commit 7b0a573)

# Conflicts:
#	accounts-db/src/accounts.rs
#	core/src/banking_stage/consumer.rs
#	core/src/banking_stage/immutable_deserialized_packet.rs
#	core/src/banking_stage/latest_unprocessed_votes.rs
#	core/src/banking_stage/transaction_scheduler/scheduler_controller.rs
#	runtime/src/bank/address_lookup_table.rs
@mergify mergify bot requested a review from a team as a code owner October 15, 2024 15:26
@mergify mergify bot added the conflicts label Oct 15, 2024
Copy link
Author

mergify bot commented Oct 15, 2024

Cherry-pick of 7b0a573 has failed:

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

You are currently cherry-picking commit 7b0a57316d.
  (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/banking_stage/consume_worker.rs
	modified:   core/src/banking_stage/scheduler_messages.rs
	modified:   core/src/banking_stage/transaction_scheduler/prio_graph_scheduler.rs
	modified:   core/src/banking_stage/transaction_scheduler/transaction_state.rs
	modified:   core/src/banking_stage/transaction_scheduler/transaction_state_container.rs
	modified:   core/src/banking_stage/unprocessed_packet_batches.rs
	modified:   core/src/banking_stage/unprocessed_transaction_storage.rs
	modified:   sdk/program/src/address_lookup_table/state.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   accounts-db/src/accounts.rs
	both modified:   core/src/banking_stage/consumer.rs
	both modified:   core/src/banking_stage/immutable_deserialized_packet.rs
	both modified:   core/src/banking_stage/latest_unprocessed_votes.rs
	both modified:   core/src/banking_stage/transaction_scheduler/scheduler_controller.rs
	both modified:   runtime/src/bank/address_lookup_table.rs

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

@apfitzge
Copy link

d627be0 has the conflict resolutions. Many are simply due to the restructing that is happening in master for the new transaction type and abstraction behind SVMMessage/Transaction

@apfitzge apfitzge force-pushed the mergify/bp/v2.0/pr-3161 branch from d627be0 to 99178e9 Compare October 15, 2024 17:55
@apfitzge apfitzge requested a review from jstarry October 15, 2024 19:36
@t-nelson
Copy link

is there no smaller patch? this is a bit much... backports to stable need to be obvious

Copy link

@bw-solana bw-solana left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@sakridge sakridge left a comment

Choose a reason for hiding this comment

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

lgtm

@apfitzge apfitzge merged commit 8561902 into v2.0 Oct 17, 2024
39 checks passed
@apfitzge apfitzge deleted the mergify/bp/v2.0/pr-3161 branch October 17, 2024 17:52
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.

5 participants