kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-01-12 22:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't panic if the network dispatch fails (partially addresses #2270 -- at least now resource exhaustion won't trigger a crash this way)

Browse Source
This commit is contained in:
Jude Nelson
2021-01-05 15:36:36 -05:00
parent 404f87d009
commit 6c1b2ed64b
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
testnet/stacks-node/src/neon_node.rs
View File

@@ -614,7 +614,7 @@ fn spawn_peer(
let _ = Relayer::setup_unconfirmed_state_readonly(&mut chainstate, &sortdb);
recv_unconfirmed_txs(&mut chainstate, unconfirmed_txs.clone());
let network_result = match this.run(
match this.run(
&sortdb,
&mut chainstate,
&mut mem_pool,
@@ -624,35 +624,37 @@ fn spawn_peer(
&handler_args,
&mut expected_attachments,
) {
Ok(res) => res,
Ok(network_result) => {
if num_p2p_state_machine_passes < network_result.num_state_machine_passes {
// p2p state-machine did a full pass. Notify anyone listening.
sync_comms.notify_p2p_state_pass();
num_p2p_state_machine_passes = network_result.num_state_machine_passes;
}
if num_inv_sync_passes < network_result.num_inv_sync_passes {
// inv-sync state-machine did a full pass. Notify anyone listening.
sync_comms.notify_inv_sync_pass();
num_inv_sync_passes = network_result.num_inv_sync_passes;
}
if network_result.has_data_to_store() {
results_with_data
.push_back(RelayerDirective::HandleNetResult(network_result));
}
// only do this on the Ok() path, even if we're mining, because an error in
// network dispatching is likely due to resource exhaustion
if mblock_deadline < get_epoch_time_ms() {
results_with_data.push_back(RelayerDirective::RunMicroblockTenure);
mblock_deadline =
get_epoch_time_ms() + (config.node.microblock_frequency as u128);
}
}
Err(e) => {
error!("P2P: Failed to process network dispatch: {:?}", &e);
panic!();
}
};
if num_p2p_state_machine_passes < network_result.num_state_machine_passes {
// p2p state-machine did a full pass. Notify anyone listening.
sync_comms.notify_p2p_state_pass();
num_p2p_state_machine_passes = network_result.num_state_machine_passes;
}
if num_inv_sync_passes < network_result.num_inv_sync_passes {
// inv-sync state-machine did a full pass. Notify anyone listening.
sync_comms.notify_inv_sync_pass();
num_inv_sync_passes = network_result.num_inv_sync_passes;
}
if network_result.has_data_to_store() {
results_with_data.push_back(RelayerDirective::HandleNetResult(network_result));
}
if mblock_deadline < get_epoch_time_ms() {
results_with_data.push_back(RelayerDirective::RunMicroblockTenure);
mblock_deadline =
get_epoch_time_ms() + (config.node.microblock_frequency as u128);
}
while let Some(next_result) = results_with_data.pop_front() {
// have blocks, microblocks, and/or transactions (don't care about anything else),
// or a directive to mine microblocks