validator: Add experimental flag to select PoH pinned core

This commit is contained in:
Trent Nelson
2020-12-29 12:09:47 -07:00
committed by Trent Nelson
parent 82f61c0c4a
commit fe667db910
6 changed files with 39 additions and 5 deletions

View File

@ -4,7 +4,7 @@
use crate::{
cluster_info::ClusterInfo,
poh_recorder::{PohRecorder, PohRecorderError, WorkingBankEntry},
poh_service::PohService,
poh_service::{self, PohService},
};
use crossbeam_channel::{Receiver as CrossbeamReceiver, RecvTimeoutError};
use itertools::Itertools;
@ -1093,6 +1093,7 @@ pub fn create_test_recorder(
&poh_config,
&exit,
bank.ticks_per_slot(),
poh_service::DEFAULT_PINNED_CPU_CORE,
);
(exit, poh_recorder, poh_service, entry_receiver)

View File

@ -19,12 +19,15 @@ pub struct PohService {
// See benches/poh.rs for some benchmarks that attempt to justify this magic number.
pub const NUM_HASHES_PER_BATCH: u64 = 1;
pub const DEFAULT_PINNED_CPU_CORE: usize = 0;
impl PohService {
pub fn new(
poh_recorder: Arc<Mutex<PohRecorder>>,
poh_config: &Arc<PohConfig>,
poh_exit: &Arc<AtomicBool>,
ticks_per_slot: u64,
pinned_cpu_core: usize,
) -> Self {
let poh_exit_ = poh_exit.clone();
let poh_config = poh_config.clone();
@ -47,7 +50,7 @@ impl PohService {
// Let's dedicate one of the CPU cores to this thread so that it can gain
// from cache performance.
if let Some(cores) = core_affinity::get_core_ids() {
core_affinity::set_for_current(cores[0]);
core_affinity::set_for_current(cores[pinned_cpu_core]);
}
Self::tick_producer(
poh_recorder,
@ -215,7 +218,13 @@ mod tests {
.unwrap()
};
let poh_service = PohService::new(poh_recorder.clone(), &poh_config, &exit, 0);
let poh_service = PohService::new(
poh_recorder.clone(),
&poh_config,
&exit,
0,
DEFAULT_PINNED_CPU_CORE,
);
poh_recorder.lock().unwrap().set_working_bank(working_bank);
// get some events

View File

@ -16,7 +16,7 @@ use crate::{
OptimisticallyConfirmedBank, OptimisticallyConfirmedBankTracker,
},
poh_recorder::{PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
poh_service::PohService,
poh_service::{self, PohService},
rewards_recorder_service::{RewardsRecorderSender, RewardsRecorderService},
rpc::JsonRpcConfig,
rpc_pubsub_service::{PubSubConfig, PubSubService},
@ -116,6 +116,7 @@ pub struct ValidatorConfig {
pub send_transaction_retry_ms: u64,
pub send_transaction_leader_forward_count: u64,
pub no_poh_speed_test: bool,
pub poh_pinned_cpu_core: usize,
}
impl Default for ValidatorConfig {
@ -159,6 +160,7 @@ impl Default for ValidatorConfig {
send_transaction_retry_ms: 2000,
send_transaction_leader_forward_count: 2,
no_poh_speed_test: true,
poh_pinned_cpu_core: poh_service::DEFAULT_PINNED_CPU_CORE,
}
}
}
@ -547,6 +549,7 @@ impl Validator {
&poh_config,
&exit,
bank.ticks_per_slot(),
config.poh_pinned_cpu_core,
);
assert_eq!(
blockstore.new_shreds_signals.len(),