zecfoundation
/
parity-zcash
mirror of https://github.com/ZcashFoundation/parity-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #447 from paritytech/fix_orphaned_blocks_cleanup 

Only cleanup orphaned blocks when not in synchronization state
This commit is contained in:
Svyatoslav Nikolsky 2017-08-24 17:03:28 +03:00 committed by GitHub
parent d2acccd1bc 6486cc77d6
commit 6f3e028102
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sync/src/synchronization_manager.rs
View File

@ -95,6 +95,8 @@ impl ManagementWorker {
manage_synchronization_peers_headers(&peers_config, core.peers(), core.peers_tasks());
manage_orphaned_transactions(&orphan_config, core.orphaned_transactions_pool());
} else {
// only remove orphaned blocks when not in synchronization state
if let Some(orphans_to_remove) = manage_unknown_orphaned_blocks(&unknown_config, core.orphaned_blocks_pool()) {
for orphan_to_remove in orphans_to_remove {
core.chain().forget_block(&orphan_to_remove);
@ -280,14 +282,14 @@ pub fn manage_orphaned_transactions(config: &ManageOrphanTransactionsConfig, orp
let mut remove_num = if unknown_transactions.len() > config.max_number { unknown_transactions.len() - config.max_number } else { 0 };
let now = precise_time_s();
for (hash, orphan_tx) in unknown_transactions {
// remove oldest blocks if there are more unknown blocks that we can hold in memory
// remove oldest transactions if there are more unknown transactions that we can hold in memory
if remove_num > 0 {
orphans_to_remove.push(hash.clone());
remove_num -= 1;
continue;
}
// check if block is unknown for too long
// check if transaction is unknown for too long
let time_diff = now - orphan_tx.insertion_time;
if time_diff <= config.removal_time_ms as f64 / 1000f64 {
break;
@ -298,7 +300,7 @@ pub fn manage_orphaned_transactions(config: &ManageOrphanTransactionsConfig, orp
orphans_to_remove
};
// remove unknown blocks
// remove unknown transactions
let orphans_to_remove: Vec<H256> = orphaned_transactions_pool.remove_transactions(&orphans_to_remove).into_iter()
.map(|t| t.hash)
.collect();