From 84732d4b941e03d7f413d482b0d7c70657e69f30 Mon Sep 17 00:00:00 2001 From: arkpar Date: Thu, 11 Feb 2016 21:10:41 +0100 Subject: [PATCH] Sync fixes --- ethcore/src/block_queue.rs | 2 +- ethcore/src/client.rs | 36 +++++++++++++++++++++--------------- sync/src/chain.rs | 4 ++-- util/src/network/host.rs | 2 +- util/src/network/session.rs | 3 ++- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ethcore/src/block_queue.rs b/ethcore/src/block_queue.rs index dcfcec1e4..ee77c56a4 100644 --- a/ethcore/src/block_queue.rs +++ b/ethcore/src/block_queue.rs @@ -105,7 +105,7 @@ struct Verification { bad: HashSet, } -const MAX_UNVERIFIED_QUEUE_SIZE: usize = 50000; +const MAX_UNVERIFIED_QUEUE_SIZE: usize = 2000; impl BlockQueue { /// Creates a new queue instance. diff --git a/ethcore/src/client.rs b/ethcore/src/client.rs index 5d6537b24..688b697e4 100644 --- a/ethcore/src/client.rs +++ b/ethcore/src/client.rs @@ -350,24 +350,26 @@ impl Client { self.chain.write().unwrap().configure_cache(pref_cache_size, max_cache_size); } - fn block_hash(&self, id: BlockId) -> Option { + fn block_hash(chain: &BlockChain, id: BlockId) -> Option { match id { BlockId::Hash(hash) => Some(hash), - BlockId::Number(number) => self.chain.read().unwrap().block_hash(number), - BlockId::Earliest => self.chain.read().unwrap().block_hash(0), - BlockId::Latest => Some(self.chain.read().unwrap().best_block_hash()) + BlockId::Number(number) => chain.block_hash(number), + BlockId::Earliest => chain.block_hash(0), + BlockId::Latest => Some(chain.best_block_hash()) } } } impl BlockChainClient for Client { fn block_header(&self, id: BlockId) -> Option { - self.block_hash(id).and_then(|hash| self.chain.read().unwrap().block(&hash).map(|bytes| BlockView::new(&bytes).rlp().at(0).as_raw().to_vec())) + let chain = self.chain.read().unwrap(); + Self::block_hash(&chain, id).and_then(|hash| chain.block(&hash).map(|bytes| BlockView::new(&bytes).rlp().at(0).as_raw().to_vec())) } fn block_body(&self, id: BlockId) -> Option { - self.block_hash(id).and_then(|hash| { - self.chain.read().unwrap().block(&hash).map(|bytes| { + let chain = self.chain.read().unwrap(); + Self::block_hash(&chain, id).and_then(|hash| { + chain.block(&hash).map(|bytes| { let rlp = Rlp::new(&bytes); let mut body = RlpStream::new_list(2); body.append_raw(rlp.at(1).as_raw(), 1); @@ -378,21 +380,24 @@ impl BlockChainClient for Client { } fn block(&self, id: BlockId) -> Option { - self.block_hash(id).and_then(|hash| { - self.chain.read().unwrap().block(&hash) + let chain = self.chain.read().unwrap(); + Self::block_hash(&chain, id).and_then(|hash| { + chain.block(&hash) }) } fn block_status(&self, id: BlockId) -> BlockStatus { - match self.block_hash(id) { - Some(ref hash) if self.chain.read().unwrap().is_known(hash) => BlockStatus::InChain, + let chain = self.chain.read().unwrap(); + match Self::block_hash(&chain, id) { + Some(ref hash) if chain.is_known(hash) => BlockStatus::InChain, Some(hash) => self.block_queue.read().unwrap().block_status(&hash), None => BlockStatus::Unknown } } fn block_total_difficulty(&self, id: BlockId) -> Option { - self.block_hash(id).and_then(|hash| self.chain.read().unwrap().block_details(&hash)).map(|d| d.total_difficulty) + let chain = self.chain.read().unwrap(); + Self::block_hash(&chain, id).and_then(|hash| chain.block_details(&hash)).map(|d| d.total_difficulty) } fn code(&self, address: &Address) -> Option { @@ -400,13 +405,14 @@ impl BlockChainClient for Client { } fn transaction(&self, id: TransactionId) -> Option { + let chain = self.chain.read().unwrap(); match id { - TransactionId::Hash(ref hash) => self.chain.read().unwrap().transaction_address(hash), - TransactionId::Location(id, index) => self.block_hash(id).map(|hash| TransactionAddress { + TransactionId::Hash(ref hash) => chain.transaction_address(hash), + TransactionId::Location(id, index) => Self::block_hash(&chain, id).map(|hash| TransactionAddress { block_hash: hash, index: index }) - }.and_then(|address| self.chain.read().unwrap().transaction(&address)) + }.and_then(|address| chain.transaction(&address)) } fn tree_route(&self, from: &H256, to: &H256) -> Option { diff --git a/sync/src/chain.rs b/sync/src/chain.rs index 5fcbfdf27..f0c0347a9 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -583,7 +583,7 @@ impl ChainSync { trace!(target: "sync", "Starting sync with better chain"); self.request_headers_by_hash(io, peer_id, &peer_latest, 1, 0, false); } - else if self.state == SyncState::Blocks { + else if self.state == SyncState::Blocks && io.chain().block_status(BlockId::Hash(peer_latest)) == BlockStatus::Unknown { self.request_blocks(io, peer_id); } } @@ -1045,7 +1045,7 @@ impl ChainSync { fn check_resume(&mut self, io: &mut SyncIo) { if !io.chain().queue_info().is_full() && self.state == SyncState::Waiting { - self.state = SyncState::Idle; + self.state = SyncState::Blocks; self.continue_sync(io); } } diff --git a/util/src/network/host.rs b/util/src/network/host.rs index fb1e8e1df..c1423dbb3 100644 --- a/util/src/network/host.rs +++ b/util/src/network/host.rs @@ -412,7 +412,7 @@ impl Host where Message: Send + Sync + Clone { let mut to_kill = Vec::new(); for e in self.connections.write().unwrap().iter_mut() { if let ConnectionEntry::Session(ref mut s) = *e.lock().unwrap().deref_mut() { - if !s.keep_alive() { + if !s.keep_alive(io) { s.disconnect(DisconnectReason::PingTimeout); to_kill.push(s.token()); } diff --git a/util/src/network/session.rs b/util/src/network/session.rs index 8e9a3a9ff..b38807c49 100644 --- a/util/src/network/session.rs +++ b/util/src/network/session.rs @@ -180,7 +180,7 @@ impl Session { } /// Keep this session alive. Returns false if ping timeout happened - pub fn keep_alive(&mut self) -> bool { + pub fn keep_alive(&mut self, io: &IoContext) -> bool where Message: Send + Sync + Clone { let timed_out = if let Some(pong) = self.pong_time_ns { pong - self.ping_time_ns > PING_TIMEOUT_SEC * 1000_000_000 } else { @@ -191,6 +191,7 @@ impl Session { if let Err(e) = self.send_ping() { debug!("Error sending ping message: {:?}", e); } + io.update_registration(self.token()).unwrap_or_else(|e| debug!(target: "net", "Session registration error: {:?}", e)); } !timed_out }