codex-storage
/
nim-codex
mirror of https://github.com/codex-storage/nim-codex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build] track nim-libp2p's unstable branch

This commit is contained in:
Michael Bradley, Jr 2022-09-13 19:13:16 -05:00 committed by Dmitriy Ryajov
parent 7b80e24962
commit 61b18bbe93
No known key found for this signature in database
GPG Key ID: DA8C680CE7C657A4
12 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,3 +33,4 @@ nimble.paths
.update.timestamp .update.timestamp
codex.nims codex.nims
nimbus-build-system.paths

2
codex/blockexchange/engine/engine.nim
View File

@ -302,7 +302,7 @@ proc blocksHandler*(
trace "Got blocks from peer", peer, len = blocks.len trace "Got blocks from peer", peer, len = blocks.len
for blk in blocks: for blk in blocks:
if isErr (await b.localStore.putBlock(blk)): if isErr (await b.localStore.putBlock(blk)):
trace "Unable to store block", cid = blk.cid trace "Unable to store block", cid = $blk.cid
await b.resolveBlocks(blocks) await b.resolveBlocks(blocks)
let let

2
codex/blockexchange/engine/pendingblocks.nim
View File

@ -52,7 +52,7 @@ proc getWantHandle*(
return await p.blocks[cid].handle.wait(timeout) return await p.blocks[cid].handle.wait(timeout)
except CancelledError as exc: except CancelledError as exc:
trace "Blocks cancelled", exc = exc.msg, cid trace "Blocks cancelled", exc = exc.msg, cid = $cid
raise exc raise exc
except CatchableError as exc: except CatchableError as exc:
trace "Pending WANT failed or expired", exc = exc.msg trace "Pending WANT failed or expired", exc = exc.msg

16
codex/erasure/erasure.nim
View File

@ -76,7 +76,7 @@ proc encode*(
## ##
logScope: logScope:
original_cid = manifest.cid.get() original_cid = $manifest.cid.get()
original_len = manifest.len original_len = manifest.len
blocks = blocks blocks = blocks
parity = parity parity = parity
@ -118,7 +118,7 @@ proc encode*(
trace "Unable to retrieve block", error = error.msg trace "Unable to retrieve block", error = error.msg
return failure error return failure error
trace "Encoding block", cid = blk.cid, pos = idx trace "Encoding block", cid = $blk.cid, pos = idx
shallowCopy(data[j], blk.data) shallowCopy(data[j], blk.data)
else: else:
trace "Padding with empty block", pos = idx trace "Padding with empty block", pos = idx
@ -137,10 +137,10 @@ proc encode*(
trace "Unable to create parity block", err = error.msg trace "Unable to create parity block", err = error.msg
return failure(error) return failure(error)
trace "Adding parity block", cid = blk.cid, pos = idx trace "Adding parity block", cid = $blk.cid, pos = idx
encoded[idx] = blk.cid encoded[idx] = blk.cid
if isErr (await self.store.putBlock(blk)): if isErr (await self.store.putBlock(blk)):
trace "Unable to store block!", cid = blk.cid trace "Unable to store block!", cid = $blk.cid
return failure("Unable to store block!") return failure("Unable to store block!")
except CancelledError as exc: except CancelledError as exc:
trace "Erasure coding encoding cancelled" trace "Erasure coding encoding cancelled"
@ -212,10 +212,10 @@ proc decode*(
continue continue
if idx >= encoded.K: if idx >= encoded.K:
trace "Retrieved parity block", cid = blk.cid, idx trace "Retrieved parity block", cid = $blk.cid, idx
shallowCopy(parityData[idx - encoded.K], if blk.isEmpty: emptyBlock else: blk.data) shallowCopy(parityData[idx - encoded.K], if blk.isEmpty: emptyBlock else: blk.data)
else: else:
trace "Retrieved data block", cid = blk.cid, idx trace "Retrieved data block", cid = $blk.cid, idx
shallowCopy(data[idx], if blk.isEmpty: emptyBlock else: blk.data) shallowCopy(data[idx], if blk.isEmpty: emptyBlock else: blk.data)
resolved.inc resolved.inc
@ -241,9 +241,9 @@ proc decode*(
trace "Unable to create block!", exc = error.msg trace "Unable to create block!", exc = error.msg
return failure(error) return failure(error)
trace "Recovered block", cid = blk.cid trace "Recovered block", cid = $blk.cid
if isErr (await self.store.putBlock(blk)): if isErr (await self.store.putBlock(blk)):
trace "Unable to store block!", cid = blk.cid trace "Unable to store block!", cid = $blk.cid
return failure("Unable to store block!") return failure("Unable to store block!")
except CancelledError as exc: except CancelledError as exc:
trace "Erasure coding decoding cancelled" trace "Erasure coding decoding cancelled"

2
codex/manifest/manifest.nim
View File

@ -49,7 +49,7 @@ func `[]=`*(self: Manifest, i: BackwardsIndex, item: Cid) =
proc add*(self: Manifest, cid: Cid) = proc add*(self: Manifest, cid: Cid) =
assert not self.protected # we expect that protected manifests are created with properly-sized self.blocks assert not self.protected # we expect that protected manifests are created with properly-sized self.blocks
self.rootHash = Cid.none self.rootHash = Cid.none
trace "Adding cid to manifest", cid trace "Adding cid to manifest", cid = $cid
self.blocks.add(cid) self.blocks.add(cid)
self.originalBytes = self.blocks.len * self.blockSize self.originalBytes = self.blocks.len * self.blockSize

24
codex/node.nim
View File

@ -73,7 +73,7 @@ proc fetchManifest*(
containerType =? ManifestContainers.?[$contentType]: containerType =? ManifestContainers.?[$contentType]:
return failure "CID has invalid content type for manifest" return failure "CID has invalid content type for manifest"
trace "Received retrieval request", cid trace "Received retrieval request", cid = $cid
without blk =? await node.blockStore.getBlock(cid), error: without blk =? await node.blockStore.getBlock(cid), error:
return failure error return failure error
@ -126,9 +126,9 @@ proc retrieve*(
try: try:
# Spawn an erasure decoding job # Spawn an erasure decoding job
without res =? (await node.erasure.decode(manifest)), error: without res =? (await node.erasure.decode(manifest)), error:
trace "Unable to erasure decode manifest", cid, exc = error.msg trace "Unable to erasure decode manifest", cid = $cid, exc = error.msg
except CatchableError as exc: except CatchableError as exc:
trace "Exception decoding manifest", cid trace "Exception decoding manifest", cid = $cid
# #
asyncSpawn erasureJob() asyncSpawn erasureJob()
else: else:
@ -219,8 +219,8 @@ proc store*(
trace "Unable to generate manifest Cid!", exc = error.msg trace "Unable to generate manifest Cid!", exc = error.msg
return failure(error.msg) return failure(error.msg)
trace "Stored data", manifestCid = manifest.cid, trace "Stored data", manifestCid = $manifest.cid,
contentCid = cid, contentCid = $cid,
blocks = blockManifest.len blocks = blockManifest.len
# Announce manifest # Announce manifest
@ -244,19 +244,19 @@ proc requestStorage*(self: CodexNodeRef,
## - Run the PoR setup on the erasure dataset ## - Run the PoR setup on the erasure dataset
## - Call into the marketplace and purchasing contracts ## - Call into the marketplace and purchasing contracts
## ##
trace "Received a request for storage!", cid, duration, nodes, tolerance, reward trace "Received a request for storage!", cid = $cid, duration, nodes, tolerance, reward
without contracts =? self.contracts: without contracts =? self.contracts:
trace "Purchasing not available" trace "Purchasing not available"
return failure "Purchasing not available" return failure "Purchasing not available"
without manifest =? await self.fetchManifest(cid), error: without manifest =? await self.fetchManifest(cid), error:
trace "Unable to fetch manifest for cid", cid trace "Unable to fetch manifest for cid", cid = $cid
raise error raise error
# Erasure code the dataset according to provided parameters # Erasure code the dataset according to provided parameters
without encoded =? (await self.erasure.encode(manifest, nodes.int, tolerance.int)), error: without encoded =? (await self.erasure.encode(manifest, nodes.int, tolerance.int)), error:
trace "Unable to erasure code dataset", cid trace "Unable to erasure code dataset", cid = $cid
return failure(error) return failure(error)
without encodedData =? encoded.encode(), error: without encodedData =? encoded.encode(), error:
@ -268,7 +268,7 @@ proc requestStorage*(self: CodexNodeRef,
return failure(error) return failure(error)
if isErr (await self.blockStore.putBlock(encodedBlk)): if isErr (await self.blockStore.putBlock(encodedBlk)):
trace "Unable to store encoded manifest block", cid = encodedBlk.cid trace "Unable to store encoded manifest block", cid = $encodedBlk.cid
return failure("Unable to store encoded manifest block") return failure("Unable to store encoded manifest block")
let request = StorageRequest( let request = StorageRequest(
@ -334,14 +334,14 @@ proc start*(node: CodexNodeRef) {.async.} =
## ##
without cid =? Cid.init(request.content.cid): without cid =? Cid.init(request.content.cid):
trace "Unable to parse Cid", cid trace "Unable to parse Cid", cid = $cid
raise newException(CodexError, "Unable to parse Cid") raise newException(CodexError, "Unable to parse Cid")
without manifest =? await node.fetchManifest(cid), error: without manifest =? await node.fetchManifest(cid), error:
trace "Unable to fetch manifest for cid", cid trace "Unable to fetch manifest for cid", cid = $cid
raise error raise error
trace "Fetching block for manifest", cid trace "Fetching block for manifest", cid = $cid
# TODO: This will probably require a call to `getBlock` either way, # TODO: This will probably require a call to `getBlock` either way,
# since fetching of blocks will have to be selective according # since fetching of blocks will have to be selective according
# to a combination of parameters, such as node slot position # to a combination of parameters, such as node slot position

2
codex/rest/api.nim
View File

@ -123,7 +123,7 @@ proc initRestApi*(node: CodexNodeRef, conf: CodexConf): RestRouter =
trace "Excepting streaming blocks", exc = exc.msg trace "Excepting streaming blocks", exc = exc.msg
return RestApiResponse.error(Http500) return RestApiResponse.error(Http500)
finally: finally:
trace "Sent bytes", cid = id.get(), bytes trace "Sent bytes", cid = $id.get(), bytes
if not stream.isNil: if not stream.isNil:
await stream.close() await stream.close()

2
codex/storageproofs/stpnetwork.nim
View File

@ -63,7 +63,7 @@ proc uploadTags*(
except CancelledError as exc: except CancelledError as exc:
raise exc raise exc
except CatchableError as exc: except CatchableError as exc:
trace "Exception submitting tags", cid, exc = exc.msg trace "Exception submitting tags", cid = $cid, exc = exc.msg
return failure(exc.msg) return failure(exc.msg)
finally: finally:
await conn.close() await conn.close()

10
codex/stores/cachestore.nim
View File

@ -47,7 +47,7 @@ method getBlock*(self: CacheStore, cid: Cid): Future[?!Block] {.async.} =
## Get a block from the stores ## Get a block from the stores
## ##
trace "Getting block from cache", cid trace "Getting block from cache", cid = $cid
if cid.isEmpty: if cid.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
@ -59,14 +59,14 @@ method getBlock*(self: CacheStore, cid: Cid): Future[?!Block] {.async.} =
try: try:
return success self.cache[cid] return success self.cache[cid]
except CatchableError as exc: except CatchableError as exc:
trace "Error requesting block from cache", cid, error = exc.msg trace "Error requesting block from cache", cid = $cid, error = exc.msg
return failure exc return failure exc
method hasBlock*(self: CacheStore, cid: Cid): Future[?!bool] {.async.} = method hasBlock*(self: CacheStore, cid: Cid): Future[?!bool] {.async.} =
## Check if the block exists in the blockstore ## Check if the block exists in the blockstore
## ##
trace "Checking CacheStore for block presence", cid trace "Checking CacheStore for block presence", cid = $cid
if cid.isEmpty: if cid.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
return true.success return true.success
@ -108,7 +108,7 @@ method putBlock*(self: CacheStore, blk: Block): Future[?!void] {.async.} =
## Put a block to the blockstore ## Put a block to the blockstore
## ##
trace "Storing block in cache", cid = blk.cid trace "Storing block in cache", cid = $blk.cid
if blk.isEmpty: if blk.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
return success() return success()
@ -120,7 +120,7 @@ method delBlock*(self: CacheStore, cid: Cid): Future[?!void] {.async.} =
## Delete a block from the blockstore ## Delete a block from the blockstore
## ##
trace "Deleting block from cache", cid trace "Deleting block from cache", cid = $cid
if cid.isEmpty: if cid.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
return success() return success()

28
codex/stores/fsstore.nim
View File

@ -43,9 +43,9 @@ method getBlock*(self: FSStore, cid: Cid): Future[?!Block] {.async.} =
## ##
if not self.cache.isNil: if not self.cache.isNil:
trace "Getting block from cache or filestore", cid trace "Getting block from cache or filestore", cid = $cid
else: else:
trace "Getting block from filestore", cid trace "Getting block from filestore", cid = $cid
if cid.isEmpty: if cid.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
@ -58,7 +58,7 @@ method getBlock*(self: FSStore, cid: Cid): Future[?!Block] {.async.} =
if not cachedBlockRes.isErr: if not cachedBlockRes.isErr:
return success cachedBlockRes.get return success cachedBlockRes.get
else: else:
trace "Unable to read block from cache", cid, error = cachedBlockRes.error.msg trace "Unable to read block from cache", cid = $cid, error = cachedBlockRes.error.msg
# Read file contents # Read file contents
var var
@ -79,7 +79,7 @@ method getBlock*(self: FSStore, cid: Cid): Future[?!Block] {.async.} =
return failure "Error requesting block from filestore: " & error return failure "Error requesting block from filestore: " & error
without blk =? Block.new(cid, data), error: without blk =? Block.new(cid, data), error:
trace "Unable to construct block from data", cid, error = error.msg trace "Unable to construct block from data", cid = $cid, error = error.msg
return failure error return failure error
if not self.cache.isNil: if not self.cache.isNil:
@ -87,7 +87,7 @@ method getBlock*(self: FSStore, cid: Cid): Future[?!Block] {.async.} =
putCachedRes = await self.cache.putBlock(blk) putCachedRes = await self.cache.putBlock(blk)
if putCachedRes.isErr: if putCachedRes.isErr:
trace "Unable to store block in cache", cid, error = putCachedRes.error.msg trace "Unable to store block in cache", cid = $cid, error = putCachedRes.error.msg
return success blk return success blk
@ -97,9 +97,9 @@ method putBlock*(self: FSStore, blk: Block): Future[?!void] {.async.} =
## ##
if not self.cache.isNil: if not self.cache.isNil:
trace "Putting block into filestore and cache", cid = blk.cid trace "Putting block into filestore and cache", cid = $blk.cid
else: else:
trace "Putting block into filestore", cid = blk.cid trace "Putting block into filestore", cid = $blk.cid
if blk.isEmpty: if blk.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
@ -118,7 +118,7 @@ method putBlock*(self: FSStore, blk: Block): Future[?!void] {.async.} =
let res = io2.writeFile(path, blk.data) let res = io2.writeFile(path, blk.data)
if res.isErr: if res.isErr:
let error = io2.ioErrorMsg(res.error) let error = io2.ioErrorMsg(res.error)
trace "Unable to store block", path, cid = blk.cid, error trace "Unable to store block", path, cid = $blk.cid, error
return failure("Unable to store block") return failure("Unable to store block")
if not self.cache.isNil: if not self.cache.isNil:
@ -126,7 +126,7 @@ method putBlock*(self: FSStore, blk: Block): Future[?!void] {.async.} =
putCachedRes = await self.cache.putBlock(blk) putCachedRes = await self.cache.putBlock(blk)
if putCachedRes.isErr: if putCachedRes.isErr:
trace "Unable to store block in cache", cid = blk.cid, error = putCachedRes.error.msg trace "Unable to store block in cache", cid = $blk.cid, error = putCachedRes.error.msg
return success() return success()
@ -135,9 +135,9 @@ method delBlock*(self: FSStore, cid: Cid): Future[?!void] {.async.} =
## ##
if not self.cache.isNil: if not self.cache.isNil:
trace "Deleting block from cache and filestore", cid trace "Deleting block from cache and filestore", cid = $cid
else: else:
trace "Deleting block from filestore", cid trace "Deleting block from filestore", cid = $cid
if cid.isEmpty: if cid.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
@ -148,7 +148,7 @@ method delBlock*(self: FSStore, cid: Cid): Future[?!void] {.async.} =
delCachedRes = await self.cache.delBlock(cid) delCachedRes = await self.cache.delBlock(cid)
if delCachedRes.isErr: if delCachedRes.isErr:
trace "Unable to delete block from cache", cid, error = delCachedRes.error.msg trace "Unable to delete block from cache", cid = $cid, error = delCachedRes.error.msg
let let
path = self.blockPath(cid) path = self.blockPath(cid)
@ -156,7 +156,7 @@ method delBlock*(self: FSStore, cid: Cid): Future[?!void] {.async.} =
if res.isErr: if res.isErr:
let error = io2.ioErrorMsg(res.error) let error = io2.ioErrorMsg(res.error)
trace "Unable to delete block", path, cid, error trace "Unable to delete block", path, cid = $cid, error
return error.failure return error.failure
return success() return success()
@ -165,7 +165,7 @@ method hasBlock*(self: FSStore, cid: Cid): Future[?!bool] {.async.} =
## Check if a block exists in the filestore ## Check if a block exists in the filestore
## ##
trace "Checking filestore for block existence", cid trace "Checking filestore for block existence", cid = $cid
if cid.isEmpty: if cid.isEmpty:
trace "Empty block, ignoring" trace "Empty block, ignoring"
return true.success return true.success

10
codex/stores/networkstore.nim
View File

@ -35,11 +35,11 @@ method getBlock*(self: NetworkStore, cid: Cid): Future[?!bt.Block] {.async.} =
## Get a block from a remote peer ## Get a block from a remote peer
## ##
trace "Getting block from local store or network", cid trace "Getting block from local store or network", cid = $cid
without blk =? await self.localStore.getBlock(cid), error: without blk =? await self.localStore.getBlock(cid), error:
if not (error of BlockNotFoundError): return failure error if not (error of BlockNotFoundError): return failure error
trace "Block not in local store", cid trace "Block not in local store", cid = $cid
# TODO: What if block isn't available in the engine too? # TODO: What if block isn't available in the engine too?
# TODO: add retrieved block to the local store # TODO: add retrieved block to the local store
return (await self.engine.requestBlock(cid)).catch return (await self.engine.requestBlock(cid)).catch
@ -50,7 +50,7 @@ method putBlock*(self: NetworkStore, blk: bt.Block): Future[?!void] {.async.} =
## Store block locally and notify the network ## Store block locally and notify the network
## ##
trace "Puting block into network store", cid = blk.cid trace "Puting block into network store", cid = $blk.cid
let res = await self.localStore.putBlock(blk) let res = await self.localStore.putBlock(blk)
if res.isErr: if res.isErr:
@ -63,7 +63,7 @@ method delBlock*(self: NetworkStore, cid: Cid): Future[?!void] =
## Delete a block from the blockstore ## Delete a block from the blockstore
## ##
trace "Deleting block from network store", cid trace "Deleting block from network store", cid = $cid
return self.localStore.delBlock(cid) return self.localStore.delBlock(cid)
{.pop.} {.pop.}
@ -72,7 +72,7 @@ method hasBlock*(self: NetworkStore, cid: Cid): Future[?!bool] {.async.} =
## Check if the block exists in the blockstore ## Check if the block exists in the blockstore
## ##
trace "Checking network store for block existence", cid trace "Checking network store for block existence", cid = $cid
return await self.localStore.hasBlock(cid) return await self.localStore.hasBlock(cid)
method close*(self: NetworkStore): Future[void] {.async.} = method close*(self: NetworkStore): Future[void] {.async.} =

4
codex/streams/storestream.nim
View File

@ -69,7 +69,7 @@ method readOnce*(
## Return how many bytes were actually read before EOF was encountered. ## Return how many bytes were actually read before EOF was encountered.
## Raise exception if we are already at EOF. ## Raise exception if we are already at EOF.
trace "Reading from manifest", cid = self.manifest.cid.get(), blocks = self.manifest.len trace "Reading from manifest", cid = $self.manifest.cid.get(), blocks = self.manifest.len
if self.atEof: if self.atEof:
raise newLPStreamEOFError() raise newLPStreamEOFError()
@ -88,7 +88,7 @@ method readOnce*(
without blk =? await self.store.getBlock(self.manifest[blockNum]), error: without blk =? await self.store.getBlock(self.manifest[blockNum]), error:
raise newLPStreamReadError(error) raise newLPStreamReadError(error)
trace "Reading bytes from store stream", blockNum, cid = blk.cid, bytes = readBytes, blockOffset trace "Reading bytes from store stream", blockNum, cid = $blk.cid, bytes = readBytes, blockOffset
# Copy `readBytes` bytes starting at `blockOffset` from the block into the outbuf # Copy `readBytes` bytes starting at `blockOffset` from the block into the outbuf
if blk.isEmpty: if blk.isEmpty: