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.

Sign up for GitHub

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

Remove BlockVerificationMethod::BlockstoreProcessor #4979

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Remove BlockVerificationMethod::BlockstoreProcessor #4979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb56b7
Remove BlockVerificationMethod::BlockstoreProcessor
apfitzge Feb 13, 2025
02866d4
CHANGELOG
apfitzge Feb 13, 2025
a2ba3ab
remove blockstore-processor from ci
apfitzge Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Release channels have their own copy of this changelog:

<a name="edge-channel"></a>
## 2.3.0 - Unreleased

* Breaking:
* Removed `--block-verification-method blockstore-processor` option from validator.

## 2.2.0
* Breaking:
Expand Down
31 changes: 14 additions & 17 deletions ci/run-sanity.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,23 @@ $agave_validator --ledger config/ledger exit --force || true

wait $pid

for method in blockstore-processor unified-scheduler
do
rm -rf config/snapshot-ledger
$solana_ledger_tool create-snapshot --ledger config/ledger "$snapshot_slot" config/snapshot-ledger
cp config/ledger/genesis.tar.bz2 config/snapshot-ledger
$solana_ledger_tool copy --ledger config/ledger \
--target-db config/snapshot-ledger --starting-slot "$snapshot_slot" --ending-slot "$latest_slot"
rm -rf config/snapshot-ledger
$solana_ledger_tool create-snapshot --ledger config/ledger "$snapshot_slot" config/snapshot-ledger
cp config/ledger/genesis.tar.bz2 config/snapshot-ledger
$solana_ledger_tool copy --ledger config/ledger \
--target-db config/snapshot-ledger --starting-slot "$snapshot_slot" --ending-slot "$latest_slot"

set -x
$solana_ledger_tool --ledger config/snapshot-ledger slot "$latest_slot" --verbose --verbose \
|& grep -q "Log Messages:$" && exit 1
set -x
$solana_ledger_tool --ledger config/snapshot-ledger slot "$latest_slot" --verbose --verbose \
|& grep -q "Log Messages:$" && exit 1

$solana_ledger_tool verify --abort-on-invalid-block \
--ledger config/snapshot-ledger --block-verification-method "$method" \
--enable-rpc-transaction-history --enable-extended-tx-metadata-storage
$solana_ledger_tool verify --abort-on-invalid-block \
--ledger config/snapshot-ledger --enable-rpc-transaction-history \
--enable-extended-tx-metadata-storage

$solana_ledger_tool --ledger config/snapshot-ledger slot "$latest_slot" --verbose --verbose \
|& grep -q "Log Messages:$"
set +x
done
$solana_ledger_tool --ledger config/snapshot-ledger slot "$latest_slot" --verbose --verbose \
|& grep -q "Log Messages:$"
set +x

first_simulated_slot=$((latest_slot / 2))
purge_slot=$((first_simulated_slot + latest_slot / 4))
Expand Down
10 changes: 0 additions & 10 deletions core/src/validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ const WAIT_FOR_WEN_RESTART_SUPERMAJORITY_THRESHOLD_PERCENT: u64 =
)]
#[strum(serialize_all = "kebab-case")]
pub enum BlockVerificationMethod {
BlockstoreProcessor,
#[default]
UnifiedScheduler,
}
Expand Down Expand Up @@ -992,15 +991,6 @@ impl Validator {
let banking_tracer_channels = banking_tracer.create_channels(false);

match &config.block_verification_method {
BlockVerificationMethod::BlockstoreProcessor => {
info!("no scheduler pool is installed for block verification...");
if let Some(count) = config.unified_scheduler_handler_threads {
warn!(
"--unified-scheduler-handler-threads={count} is ignored because unified \
scheduler isn't enabled"
);
}
}
BlockVerificationMethod::UnifiedScheduler => {
let scheduler_pool = DefaultSchedulerPool::new_dyn(
config.unified_scheduler_handler_threads,
Expand Down
9 changes: 0 additions & 9 deletions ledger-tool/src/ledger_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,6 @@ pub fn load_and_process_ledger(
let unified_scheduler_handler_threads =
value_t!(arg_matches, "unified_scheduler_handler_threads", usize).ok();
match block_verification_method {
BlockVerificationMethod::BlockstoreProcessor => {
info!("no scheduler pool is installed for block verification...");
if let Some(count) = unified_scheduler_handler_threads {
warn!(
"--unified-scheduler-handler-threads={count} is ignored because unified \
scheduler isn't enabled"
);
}
}
BlockVerificationMethod::UnifiedScheduler => {
let no_replay_vote_sender = None;
let ignored_prioritization_fee_cache = Arc::new(PrioritizationFeeCache::new(0u64));
Expand Down
Loading