provisional fix so EC errors do not crash the node on download (#841)
This commit is contained in:
parent
ad53066131
commit
a55b676a42
|
@ -240,14 +240,14 @@ proc streamEntireDataset(
|
||||||
self: CodexNodeRef,
|
self: CodexNodeRef,
|
||||||
manifest: Manifest,
|
manifest: Manifest,
|
||||||
manifestCid: Cid,
|
manifestCid: Cid,
|
||||||
): ?!LPStream =
|
): Future[?!LPStream] {.async.} =
|
||||||
## Streams the contents of the entire dataset described by the manifest.
|
## Streams the contents of the entire dataset described by the manifest.
|
||||||
##
|
##
|
||||||
trace "Retrieving blocks from manifest", manifestCid
|
trace "Retrieving blocks from manifest", manifestCid
|
||||||
|
|
||||||
if manifest.protected:
|
if manifest.protected:
|
||||||
# Retrieve, decode and save to the local store all EС groups
|
# Retrieve, decode and save to the local store all EС groups
|
||||||
proc erasureJob(): Future[void] {.async.} =
|
proc erasureJob(): Future[?!void] {.async.} =
|
||||||
try:
|
try:
|
||||||
# Spawn an erasure decoding job
|
# Spawn an erasure decoding job
|
||||||
let
|
let
|
||||||
|
@ -258,10 +258,16 @@ proc streamEntireDataset(
|
||||||
self.taskpool)
|
self.taskpool)
|
||||||
without _ =? (await erasure.decode(manifest)), error:
|
without _ =? (await erasure.decode(manifest)), error:
|
||||||
trace "Unable to erasure decode manifest", manifestCid, exc = error.msg
|
trace "Unable to erasure decode manifest", manifestCid, exc = error.msg
|
||||||
except CatchableError as exc:
|
# --------------------------------------------------------------------------
|
||||||
|
# FIXME this is a HACK so that the node does not crash during the workshop.
|
||||||
|
# We should NOT catch Defect.
|
||||||
|
except Exception as exc:
|
||||||
trace "Exception decoding manifest", manifestCid, exc = exc.msg
|
trace "Exception decoding manifest", manifestCid, exc = exc.msg
|
||||||
|
return failure(exc.msg)
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
|
||||||
asyncSpawn erasureJob()
|
if err =? (await erasureJob()).errorOption:
|
||||||
|
return failure(err)
|
||||||
|
|
||||||
# Retrieve all blocks of the dataset sequentially from the local store or network
|
# Retrieve all blocks of the dataset sequentially from the local store or network
|
||||||
trace "Creating store stream for manifest", manifestCid
|
trace "Creating store stream for manifest", manifestCid
|
||||||
|
@ -283,7 +289,7 @@ proc retrieve*(
|
||||||
|
|
||||||
return await self.streamSingleBlock(cid)
|
return await self.streamSingleBlock(cid)
|
||||||
|
|
||||||
self.streamEntireDataset(manifest, cid)
|
await self.streamEntireDataset(manifest, cid)
|
||||||
|
|
||||||
proc store*(
|
proc store*(
|
||||||
self: CodexNodeRef,
|
self: CodexNodeRef,
|
||||||
|
|
Loading…
Reference in New Issue