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

Adjust solana-core for cleaner scheduler-pr diff #33881

Merged
merged 1 commit into from
Oct 27, 2023

Conversation

ryoqun
Copy link
Contributor

@ryoqun ryoqun commented Oct 26, 2023

yet another small prep pr...

extracted from: #33070

@ryoqun ryoqun requested a review from apfitzge October 26, 2023 13:03
@@ -2786,7 +2786,6 @@ impl ReplayStage {
match replay_result {
Ok(replay_tx_count) => tx_count += replay_tx_count,
Err(err) => {
// Error means the slot needs to be marked as dead
Copy link
Contributor Author

Choose a reason for hiding this comment

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

kind of redundant comment.

@@ -2802,8 +2801,7 @@ impl ReplayStage {
ancestor_hashes_replay_update_sender,
purge_repair_slot_counter,
);
// If the bank was corrupted, don't try to run the below logic to check if the
// bank is completed
// don't try to run the below logic to check if the bank is completed
Copy link
Contributor Author

Choose a reason for hiding this comment

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

corrupted is kind of ambiguous word. just remove it.

Comment on lines +815 to +820
let (replay_vote_sender, replay_vote_receiver) = unbounded();

// block min prioritization fee cache should be readable by RPC, and writable by validator
// (by both replay stage and banking stage)
let prioritization_fee_cache = Arc::new(PrioritizationFeeCache::default());

Copy link
Contributor Author

@ryoqun ryoqun Oct 26, 2023

Choose a reason for hiding this comment

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

these two strictly-tx-execution related variables are hoisted here to be used SchedulerPool creation, which must have been completed relatively early in this fn to be ready to use for ProcessBlockStore just below.

@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Merging #33881 (ee04751) into master (70107e2) will increase coverage by 0.0%.
Report is 1 commits behind head on master.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##           master   #33881   +/-   ##
=======================================
  Coverage    81.8%    81.9%           
=======================================
  Files         809      809           
  Lines      217824   217824           
=======================================
+ Hits       178387   178421   +34     
+ Misses      39437    39403   -34     

@ryoqun ryoqun merged commit 080285c into solana-labs:master Oct 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants