Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Make sure parent block is not in importing queue when importing ancient blocks #10138

Merged
ordian merged 9 commits into from
Jan 9, 2019
Merged

Make sure parent block is not in importing queue when importing ancient blocks #10138

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b27e15
Make sure parent block is not in importing queue when importing ancie…
sorpaas Jan 6, 2019
09e0477
Merge branch 'master' into sp-ancient-fix
sorpaas Jan 6, 2019
9f4bd11
Clear queue when an ancient import fails
sorpaas Jan 6, 2019
e312073
Lock only once in clear
sorpaas Jan 6, 2019
18fdcb4
Add comments why queued check is needed
sorpaas Jan 6, 2019
d9f1c7d
Should push the value back to the queue
sorpaas Jan 7, 2019
44ad6e1
Directly check in chain.read()
sorpaas Jan 7, 2019
76cecb6
Remove extra empty line
sorpaas Jan 7, 2019
28fa60f
Revert unused verification change
sorpaas Jan 7, 2019
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
11 changes: 6 additions & 5 deletions ethcore/src/client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2165,11 +2165,8 @@ impl IoClient for Client {
// NOTE To prevent race condition with import, make sure to check queued blocks first
// (and attempt to acquire lock)
let is_parent_pending = self.queued_ancient_blocks.read().0.contains(&parent_hash);
if !is_parent_pending {
let status = self.block_status(BlockId::Hash(parent_hash));
if status == BlockStatus::Unknown {
bail!(EthcoreErrorKind::Block(BlockError::UnknownParent(parent_hash)));
}
if !is_parent_pending && !self.chain.read().is_known(&parent_hash) {
bail!(EthcoreErrorKind::Block(BlockError::UnknownParent(parent_hash)));
}
}

Expand Down Expand Up @@ -2199,6 +2196,10 @@ impl IoClient for Client {
);
if let Err(e) = result {
error!(target: "client", "Error importing ancient block: {}", e);

let mut queued = queued.write();
queued.0.clear();
queued.1.clear();
Comment thread
ascjones marked this conversation as resolved.
}
// remove from pending
queued.write().0.remove(&hash);
Expand Down