Skip to content

Fast sync download fix on restart #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 4, 2017
Merged

Fast sync download fix on restart #175

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e12aee
Fast sync download fix on restart
May 4, 2017
e9f966b
order fix
May 4, 2017
fda1a6c
enqueue items on terminated
May 4, 2017
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
32 changes: 27 additions & 5 deletions src/main/scala/io/iohk/ethereum/blockchain/sync/FastSync.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,23 @@ trait FastSync {

private var assignedHandlers: Map[ActorRef, ActorRef] = Map.empty

private val syncStateStorageActor= context.actorOf(Props[FastSyncStateActor], "state-storage")
private val syncStateStorageActor = context.actorOf(Props[FastSyncStateActor], "state-storage")

private var requestedMptNodes: Map[ActorRef, Seq[HashType]] = Map.empty
private var requestedNonMptNodes: Map[ActorRef, Seq[HashType]] = Map.empty
private var requestedBlockBodies: Map[ActorRef, Seq[ByteString]] = Map.empty
private var requestedReceipts: Map[ActorRef, Seq[ByteString]] = Map.empty

syncStateStorageActor ! fastSyncStateStorage

private val syncStatePersistCancellable =
scheduler.schedule(persistStateSnapshotInterval, persistStateSnapshotInterval) {
syncStateStorageActor ! SyncState(
initialSyncState.targetBlock,
mptNodesQueue,
nonMptNodesQueue,
blockBodiesQueue,
receiptsQueue,
requestedMptNodes.values.flatten.toSeq.distinct ++ mptNodesQueue,
requestedNonMptNodes.values.flatten.toSeq.distinct ++ nonMptNodesQueue,
requestedBlockBodies.values.flatten.toSeq.distinct ++ blockBodiesQueue,
requestedReceipts.values.flatten.toSeq.distinct ++ receiptsQueue,
downloadedNodesCount,
bestBlockHeaderNumber)
}
Expand Down Expand Up @@ -195,11 +200,17 @@ trait FastSync {
case SyncRequestHandler.Done =>
context unwatch sender()
assignedHandlers -= sender()
cleanupRequestedMaps(sender())
processSyncing()

case Terminated(ref) if assignedHandlers.contains(ref) =>
context unwatch ref
assignedHandlers -= ref
mptNodesQueue ++= requestedMptNodes.getOrElse(ref, Nil)
nonMptNodesQueue ++= requestedNonMptNodes.getOrElse(ref, Nil)
blockBodiesQueue ++= requestedBlockBodies.getOrElse(ref, Nil)
receiptsQueue ++= requestedReceipts.getOrElse(ref, Nil)
cleanupRequestedMaps(ref)

case PrintStatus =>
val totalNodesCount = downloadedNodesCount + mptNodesQueue.size + nonMptNodesQueue.size
Expand All @@ -209,6 +220,13 @@ trait FastSync {
|State: $downloadedNodesCount/$totalNodesCount known nodes.""".stripMargin.replace("\n", " "))
}

private def cleanupRequestedMaps(handler: ActorRef): Unit = {
requestedMptNodes = requestedMptNodes - handler
requestedNonMptNodes = requestedNonMptNodes - handler
requestedBlockBodies = requestedBlockBodies - handler
requestedReceipts = requestedReceipts - handler
}

private def insertBlocks(requestedHashes: Seq[ByteString], blockBodies: Seq[BlockBody]): Unit = {
//todo this is moved from FastSyncBlockBodiesRequestHandler.scala we should add block validation here
//load header from chain by hash and check consistency with BlockValidator.validateHeaderAndBody
Expand Down Expand Up @@ -300,6 +318,7 @@ trait FastSync {
context watch handler
assignedHandlers += (handler -> peer)
receiptsQueue = remainingReceipts
requestedReceipts += handler -> receiptsToGet
}

def requestBlockBodies(peer: ActorRef): Unit = {
Expand All @@ -308,6 +327,7 @@ trait FastSync {
context watch handler
assignedHandlers += (handler -> peer)
blockBodiesQueue = remainingBlockBodies
requestedBlockBodies += handler -> blockBodiesToGet
}

def requestBlockHeaders(peer: ActorRef): Unit = {
Expand All @@ -331,6 +351,8 @@ trait FastSync {
assignedHandlers += (handler -> peer)
nonMptNodesQueue = remainingNonMptNodes
mptNodesQueue = remainingMptNodes
requestedMptNodes += handler -> mptNodesToGet
requestedNonMptNodes += handler -> nonMptNodesToGet
}

def unassignedPeers: Set[ActorRef] = peersToDownloadFrom.keySet diff assignedHandlers.values.toSet
Expand Down