Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 13 additions & 7 deletions node/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,9 @@ pub struct RunFlags {
#[arg(long, default_value_t = 3030)]
pub rpc_port: u16,

#[arg(long, default_value_t = 4)]
pub worker_threads: usize,
/// Number of tokio worker threads (defaults to number of logical CPUs)
#[arg(long)]
pub worker_threads: Option<usize>,

/// level for logs (error,warn,info,debug,trace)
#[arg(
Expand Down Expand Up @@ -205,9 +206,12 @@ impl Command {
let signer = key_store.node_key.clone();

// Initialize runtime
let worker_threads = flags
.worker_threads
.unwrap_or_else(|| std::thread::available_parallelism().map_or(4, |n| n.get()));
let cfg = tokio::Config::default()
.with_tcp_nodelay(Some(true))
.with_worker_threads(flags.worker_threads)
.with_worker_threads(worker_threads)
.with_storage_directory(store_path)
.with_catch_panics(false);
let executor = tokio::Runner::new(cfg);
Expand Down Expand Up @@ -402,8 +406,6 @@ impl Command {
let backfiller =
network.register(BACKFILLER_CHANNEL, config.backfill_quota, MESSAGE_BACKLOG);

// Create network
let p2p = network.start();
// create engine
let engine: Engine<_, _, _, _> =
Engine::new(context.with_label("engine"), config).await;
Expand All @@ -413,6 +415,9 @@ impl Command {
// Start engine
let engine = engine.start(pending, recovered, resolver, broadcaster, backfiller);

// Create network
let p2p = network.start();

// Start RPC server
let key_store_path = flags.key_store_path.clone();
let rpc_port = flags.rpc_port;
Expand Down Expand Up @@ -585,15 +590,16 @@ pub fn run_node_local(
let backfiller =
network.register(BACKFILLER_CHANNEL, config.backfill_quota, MESSAGE_BACKLOG);

// Create network
let p2p = network.start();
// create engine
let engine: Engine<_, _, _, _> = Engine::new(context.with_label("engine"), config).await;

let finalizer_mailbox = engine.finalizer_mailbox.clone();
// Start engine
let engine = engine.start(pending, recovered, resolver, broadcaster, backfiller);

// Create network
let p2p = network.start();

// Start prometheus endpoint
#[cfg(feature = "prom")]
{
Expand Down
2 changes: 1 addition & 1 deletion node/src/bin/protocol_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ fn get_node_flags(node: usize, genesis_path: &str) -> RunFlags {
prom_port: (28600 + (node * 10)) as u16,
prom_ip: "0.0.0.0".into(),
rpc_port: (3030 + (node * 10)) as u16,
worker_threads: 2,
worker_threads: Some(2),
log_level: "debug".into(),
db_prefix: format!("{node}"),
genesis_path: genesis_path.into(),
Expand Down
2 changes: 1 addition & 1 deletion node/src/bin/stake_and_checkpoint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ fn get_node_flags(node: usize, genesis_path: &str) -> RunFlags {
prom_port: (28600 + (node * 10)) as u16,
prom_ip: "0.0.0.0".into(),
rpc_port: (3030 + (node * 10)) as u16,
worker_threads: 2,
worker_threads: Some(2),
log_level: "debug".into(),
db_prefix: format!("{node}"),
genesis_path: genesis_path.into(),
Expand Down
2 changes: 1 addition & 1 deletion node/src/bin/stake_and_join_with_outdated_ckpt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ fn get_node_flags(node: usize, genesis_path: &str) -> RunFlags {
prom_port: (28600 + (node * 10)) as u16,
prom_ip: "0.0.0.0".into(),
rpc_port: (3030 + (node * 10)) as u16,
worker_threads: 2,
worker_threads: Some(2),
log_level: "debug".into(),
db_prefix: format!("{node}"),
genesis_path: genesis_path.into(),
Expand Down
2 changes: 1 addition & 1 deletion node/src/bin/sync_from_genesis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ fn get_node_flags(node: usize, genesis_path: &str) -> RunFlags {
prom_port: (28600 + (node * 10)) as u16,
prom_ip: "0.0.0.0".into(),
rpc_port: (3030 + (node * 10)) as u16,
worker_threads: 2,
worker_threads: Some(2),
log_level: "debug".into(),
db_prefix: format!("{node}"),
genesis_path: genesis_path.into(),
Expand Down
2 changes: 1 addition & 1 deletion node/src/bin/testnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ fn get_node_flags(node: usize) -> RunFlags {
prom_port: (28600 + (node * 10)) as u16,
prom_ip: "0.0.0.0".into(),
rpc_port: (3030 + (node * 10)) as u16,
worker_threads: 2,
worker_threads: Some(2),
log_level: "debug".into(),
db_prefix: format!("{node}"),
genesis_path: "./example_genesis.toml".into(),
Expand Down
2 changes: 1 addition & 1 deletion node/src/bin/verify_consensus_state_proof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ fn get_node_flags(node: usize, genesis_path: &str) -> RunFlags {
prom_port: (28600 + (node * 10)) as u16,
prom_ip: "0.0.0.0".into(),
rpc_port: (3030 + (node * 10)) as u16,
worker_threads: 2,
worker_threads: Some(2),
log_level: "debug".into(),
db_prefix: format!("{node}"),
genesis_path: genesis_path.into(),
Expand Down
2 changes: 1 addition & 1 deletion node/src/bin/withdraw_and_exit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ fn get_node_flags(node: usize, genesis_path: &str) -> RunFlags {
prom_port: (28600 + (node * 10)) as u16,
prom_ip: "0.0.0.0".into(),
rpc_port: (3030 + (node * 10)) as u16,
worker_threads: 2,
worker_threads: Some(2),
log_level: "debug".into(),
db_prefix: format!("{node}"),
genesis_path: genesis_path.into(),
Expand Down
Loading