gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add --dev-halt-at-slot option (#5453)

Browse Source
This commit is contained in:
Michael Vines
2019-08-08 09:14:30 -07:00
committed by GitHub
parent 7a603d72bf
commit 8c15214923
6 changed files with 103 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/blocktree_processor.rs
View File

@ -8,8 +8,7 @@ use solana_metrics::{datapoint, datapoint_error, inc_new_counter_debug};
use solana_runtime::bank::Bank;
use solana_runtime::locked_accounts_results::LockedAccountsResults;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::timing::duration_as_ms;
use solana_sdk::timing::MAX_RECENT_BLOCKHASHES;
use solana_sdk::timing::{duration_as_ms, Slot, MAX_RECENT_BLOCKHASHES};
use solana_sdk::transaction::Result;
use std::result;
use std::sync::Arc;
@ -143,6 +142,7 @@ pub fn process_blocktree(
blocktree: &Blocktree,
account_paths: Option<String>,
verify_ledger: bool,
dev_halt_at_slot: Option<Slot>,
) -> result::Result<(BankForks, Vec<BankForksInfo>, LeaderScheduleCache), BlocktreeProcessorError> {
let now = Instant::now();
info!("processing ledger...");
@ -173,6 +173,7 @@ pub fn process_blocktree(
let mut fork_info = vec![];
let mut last_status_report = Instant::now();
let mut root = 0;
let dev_halt_at_slot = dev_halt_at_slot.unwrap_or(std::u64::MAX);
while !pending_slots.is_empty() {
let (slot, meta, bank, mut entry_height, mut last_entry_hash) =
pending_slots.pop().unwrap();
@ -233,6 +234,15 @@ pub fn process_blocktree(
fork_info.clear();
}
if slot >= dev_halt_at_slot {
let bfi = BankForksInfo {
bank_slot: slot,
entry_height,
};
fork_info.push((bank, bfi));
break;
}
if meta.next_slots.is_empty() {
// Reached the end of this fork. Record the final entry height and last entry.hash
let bfi = BankForksInfo {
@ -376,7 +386,7 @@ pub mod tests {
fill_blocktree_slot_with_ticks(&blocktree, ticks_per_slot, 2, 1, blockhash);
let (mut _bank_forks, bank_forks_info, _) =
process_blocktree(&genesis_block, &blocktree, None, true).unwrap();
process_blocktree(&genesis_block, &blocktree, None, true, None).unwrap();
assert_eq!(bank_forks_info.len(), 1);
assert_eq!(
@ -435,7 +445,7 @@ pub mod tests {
blocktree.set_roots(&[4, 1, 0]).unwrap();
let (bank_forks, bank_forks_info, _) =
process_blocktree(&genesis_block, &blocktree, None, true).unwrap();
process_blocktree(&genesis_block, &blocktree, None, true, None).unwrap();
assert_eq!(bank_forks_info.len(), 1); // One fork, other one is ignored b/c not a descendant of the root
@ -509,7 +519,7 @@ pub mod tests {
blocktree.set_roots(&[0, 1]).unwrap();
let (bank_forks, bank_forks_info, _) =
process_blocktree(&genesis_block, &blocktree, None, true).unwrap();
process_blocktree(&genesis_block, &blocktree, None, true, None).unwrap();
assert_eq!(bank_forks_info.len(), 2); // There are two forks
assert_eq!(
@ -590,7 +600,7 @@ pub mod tests {
// Check that we can properly restart the ledger / leader scheduler doesn't fail
let (bank_forks, bank_forks_info, _) =
process_blocktree(&genesis_block, &blocktree, None, true).unwrap();
process_blocktree(&genesis_block, &blocktree, None, true, None).unwrap();
assert_eq!(bank_forks_info.len(), 1); // There is one fork
assert_eq!(
@ -726,7 +736,7 @@ pub mod tests {
.unwrap();
let entry_height = genesis_block.ticks_per_slot + entries.len() as u64;
let (bank_forks, bank_forks_info, _) =
process_blocktree(&genesis_block, &blocktree, None, true).unwrap();
process_blocktree(&genesis_block, &blocktree, None, true, None).unwrap();
assert_eq!(bank_forks_info.len(), 1);
assert_eq!(bank_forks.root(), 0);
@ -757,7 +767,7 @@ pub mod tests {
let blocktree = Blocktree::open(&ledger_path).unwrap();
let (bank_forks, bank_forks_info, _) =
process_blocktree(&genesis_block, &blocktree, None, true).unwrap();
process_blocktree(&genesis_block, &blocktree, None, true, None).unwrap();
assert_eq!(bank_forks_info.len(), 1);
assert_eq!(

124
core/src/validator.rs
View File

@ -25,7 +25,7 @@ use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::poh_config::PohConfig;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::timing::{timestamp, DEFAULT_SLOTS_PER_TURN};
use solana_sdk::timing::{timestamp, Slot, DEFAULT_SLOTS_PER_TURN};
use std::fs;
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use std::path::{Path, PathBuf};
@ -36,7 +36,8 @@ use std::thread::Result;
#[derive(Clone, Debug)]
pub struct ValidatorConfig {
pub sigverify_disabled: bool,
pub dev_sigverify_disabled: bool,
pub dev_halt_at_slot: Option<Slot>,
pub voting_disabled: bool,
pub blockstream_unix_socket: Option<PathBuf>,
pub storage_slots_per_turn: u64,
@ -51,7 +52,8 @@ pub struct ValidatorConfig {
impl Default for ValidatorConfig {
fn default() -> Self {
Self {
sigverify_disabled: false,
dev_sigverify_disabled: false,
dev_halt_at_slot: None,
voting_disabled: false,
blockstream_unix_socket: None,
storage_slots_per_turn: DEFAULT_SLOTS_PER_TURN,
@ -90,6 +92,12 @@ impl Validator {
verify_ledger: bool,
config: &ValidatorConfig,
) -> Self {
info!("node info: {:?}", node.info);
info!("node entrypoint_info: {:?}", entrypoint_info_option);
info!(
"node local gossip address: {}",
node.sockets.gossip.local_addr().unwrap()
);
warn!("CUDA is {}abled", if cfg!(cuda) { "en" } else { "dis" });
let id = keypair.pubkey();
@ -109,12 +117,64 @@ impl Validator {
config.account_paths.clone(),
config.snapshot_config.clone(),
verify_ledger,
config.dev_halt_at_slot,
);
let leader_schedule_cache = Arc::new(leader_schedule_cache);
let exit = Arc::new(AtomicBool::new(false));
let bank_info = &bank_forks_info[0];
let bank = bank_forks[bank_info.bank_slot].clone();
let bank_forks = Arc::new(RwLock::new(bank_forks));
node.info.wallclock = timestamp();
let cluster_info = Arc::new(RwLock::new(ClusterInfo::new(
node.info.clone(),
keypair.clone(),
)));
let storage_state = StorageState::new(
&bank.last_blockhash(),
config.storage_slots_per_turn,
bank.slots_per_segment(),
);
let rpc_service = if node.info.rpc.port() == 0 {
None
} else {
Some(JsonRpcService::new(
&cluster_info,
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), node.info.rpc.port()),
storage_state.clone(),
config.rpc_config.clone(),
bank_forks.clone(),
ledger_path,
&exit,
))
};
let subscriptions = Arc::new(RpcSubscriptions::default());
let rpc_pubsub_service = if node.info.rpc_pubsub.port() == 0 {
None
} else {
Some(PubSubService::new(
&subscriptions,
SocketAddr::new(
IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
node.info.rpc_pubsub.port(),
),
&exit,
))
};
if config.dev_halt_at_slot.is_some() {
// Park with the RPC service running, ready for inspection!
warn!(
"Validator halted at slot {} (epoch {})",
bank.slot(),
bank.epoch()
);
std::thread::park();
}
info!(
"starting PoH... {} {}",
@ -148,58 +208,9 @@ impl Validator {
"New blob signal for the TVU should be the same as the clear bank signal."
);
info!("node info: {:?}", node.info);
info!("node entrypoint_info: {:?}", entrypoint_info_option);
info!(
"node local gossip address: {}",
node.sockets.gossip.local_addr().unwrap()
);
let bank_forks = Arc::new(RwLock::new(bank_forks));
node.info.wallclock = timestamp();
let cluster_info = Arc::new(RwLock::new(ClusterInfo::new(
node.info.clone(),
keypair.clone(),
)));
let storage_state = StorageState::new(
&bank.last_blockhash(),
config.storage_slots_per_turn,
bank.slots_per_segment(),
);
let rpc_service = if node.info.rpc.port() == 0 {
None
} else {
Some(JsonRpcService::new(
&cluster_info,
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), node.info.rpc.port()),
storage_state.clone(),
config.rpc_config.clone(),
bank_forks.clone(),
ledger_path,
&exit,
))
};
let ip_echo_server =
solana_netutil::ip_echo_server(node.sockets.gossip.local_addr().unwrap().port());
let subscriptions = Arc::new(RpcSubscriptions::default());
let rpc_pubsub_service = if node.info.rpc_pubsub.port() == 0 {
None
} else {
Some(PubSubService::new(
&subscriptions,
SocketAddr::new(
IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
node.info.rpc_pubsub.port(),
),
&exit,
))
};
let gossip_service = GossipService::new(
&cluster_info,
Some(blocktree.clone()),
@ -210,7 +221,6 @@ impl Validator {
// Insert the entrypoint info, should only be None if this node
// is the bootstrap leader
if let Some(entrypoint_info) = entrypoint_info_option {
cluster_info
.write()
@ -262,7 +272,7 @@ impl Validator {
completed_slots_receiver,
);
if config.sigverify_disabled {
if config.dev_sigverify_disabled {
warn!("signature verification disabled");
}
@ -273,7 +283,7 @@ impl Validator {
node.sockets.tpu,
node.sockets.tpu_forwards,
node.sockets.broadcast,
config.sigverify_disabled,
config.dev_sigverify_disabled,
&blocktree,
&config.broadcast_stage_type,
&config.erasure_config,
@ -312,6 +322,7 @@ fn get_bank_forks(
account_paths: Option<String>,
snapshot_config: Option<SnapshotConfig>,
verify_ledger: bool,
dev_halt_at_slot: Option<Slot>,
) -> (BankForks, Vec<BankForksInfo>, LeaderScheduleCache) {
let (mut bank_forks, bank_forks_info, leader_schedule_cache) = {
let mut result = None;
@ -362,6 +373,7 @@ fn get_bank_forks(
&blocktree,
account_paths,
verify_ledger,
dev_halt_at_slot,
)
.expect("process_blocktree failed"),
);
@ -382,6 +394,7 @@ pub fn new_banks_from_blocktree(
account_paths: Option<String>,
snapshot_config: Option<SnapshotConfig>,
verify_ledger: bool,
dev_halt_at_slot: Option<Slot>,
) -> (
BankForks,
Vec<BankForksInfo>,
@ -404,6 +417,7 @@ pub fn new_banks_from_blocktree(
account_paths,
snapshot_config,
verify_ledger,
dev_halt_at_slot,
);
(