Skip to content

Commit

Permalink
v2.0: Make unified scheduler opt-in for block verification (backport of
Browse files Browse the repository at this point in the history
#1668) (#1874)

Make unified scheduler opt-in for block verification (#1668)

* Enable unified scheduler for block verification

* Revert making unified scheduler enabled by default

(cherry picked from commit 40508cd)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
  • Loading branch information
mergify[bot] and ryoqun authored Jun 27, 2024
1 parent d40aa49 commit b463b92
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
2 changes: 0 additions & 2 deletions ledger-tool/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,6 @@ fn main() {
.takes_value(true)
.possible_values(BlockVerificationMethod::cli_names())
.global(true)
.hidden(hidden_unless_forced())
.help(BlockVerificationMethod::cli_message()),
)
.arg(
Expand All @@ -730,7 +729,6 @@ fn main() {
.takes_value(true)
.validator(|s| is_within_range(s, 1..))
.global(true)
.hidden(hidden_unless_forced())
.help(DefaultSchedulerPool::cli_message()),
)
.arg(
Expand Down
5 changes: 0 additions & 5 deletions unified-scheduler-pool/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//! NOTE: While the unified scheduler is fully functional and moderately performant even with
//! mainnet-beta, it has known resource-exhaustion related security issues for replaying
//! specially-crafted blocks produced by malicious leaders. Thus, this experimental and
//! nondefault functionality is exempt from the bug bounty program for now.
//!
//! Transaction scheduling code.
//!
//! This crate implements 3 solana-runtime traits (`InstalledScheduler`, `UninstalledScheduler` and
Expand Down
2 changes: 0 additions & 2 deletions validator/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,6 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
.arg(
Arg::with_name("block_verification_method")
.long("block-verification-method")
.hidden(hidden_unless_forced())
.value_name("METHOD")
.takes_value(true)
.possible_values(BlockVerificationMethod::cli_names())
Expand All @@ -1539,7 +1538,6 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
.arg(
Arg::with_name("unified_scheduler_handler_threads")
.long("unified-scheduler-handler-threads")
.hidden(hidden_unless_forced())
.value_name("COUNT")
.takes_value(true)
.validator(|s| is_within_range(s, 1..))
Expand Down

0 comments on commit b463b92

Please sign in to comment.