mirror of
https://github.com/logos-storage/logos-storage-nim.git
synced 2026-01-03 14:03:10 +00:00
1d161d383e
## Slot queue Adds a slot queue, as per the [slot queue design](https://github.com/codex-storage/codex-research/blob/master/design/sales.md#slot-queue). Any time storage is requested, all slots from that request are immediately added to the queue. Finished, Canclled, Failed requests remove all slots with that request id from the queue. SlotFreed events add a new slot to the queue and SlotFilled events remove the slot from the queue. This allows popping of a slot each time one is processed, making things much simpler. When an entire request of slots is added to the queue, the slot indices are shuffled randomly to hopefully prevent nodes that pick up the same storage requested event from clashing on the first processed slot index. This allowed removal of assigning a random slot index in the SalePreparing state and it also ensured that all SalesAgents will have a slot index assigned to them at the start thus the removal of the optional slotIndex. Remove slotId from SlotFreed event as it was not being used. RequestId and slotIndex were added to the SlotFreed event earlier and those are now being used The slot queue invariant that prioritises queue items added to the queue relies on a scoring mechanism to sort them based on the [sort order in the design document](https://github.com/codex-storage/codex-research/blob/master/design/sales.md#sort-order). When a storage request is handled by the sales module, a slot index was randomly assigned and then the slot was filled. Now, a random slot index is only assigned when adding an entire request to the slot queue. Additionally, the slot is checked that its state is `SlotState.Free` before continuing with the download process. SlotQueue should always ensure the underlying AsyncHeapQueue has one less than the maximum items, ensuring the SlotQueue can always have space to add an additional item regardless if it’s full or not. Constructing `SlotQueue.workers` in `SlotQueue.new` calls `newAsyncQueue` which causes side effects, so the construction call had to be moved to `SlotQueue.start`. Prevent loading request from contract (network request) if there is an existing item in queue for that request. Check availability before adding request to queue. Add ability to query market contract for past events. When new availabilities are added, the `onReservationAdded` callback is triggered in which past `StorageRequested` events are queried, and those slots are added to the queue (filtered by availability on `push` and filtered by state in `SalePreparing`). #### Request Workers Limit the concurrent requests being processed in the queue by using a limited pool of workers (default = 3). Workers are in a data structure of type `AsyncQueue[SlotQueueWorker]`. This allows us to await a `popFirst` for available workers inside of the main SlotQueue event loop Add an `onCleanUp` that stops the agents and removes them from the sales module agent list. `onCleanUp` is called from sales end states (eg ignored, cancelled, finished, failed, errored). Add a `doneProcessing` future to `SlotQueueWorker` to be completed in the `OnProcessSlot` callback. Each `doneProcessing` future created is cancelled and awaited in `SlotQueue.stop` (thanks to `TrackableFuturees`), which forced `stop` to become async. - Cancel dispatched workers and the `onProcessSlot` callbacks, prevents zombie callbacks #### Add TrackableFutures Allow tracking of futures in a module so they can be cancelled at a later time. Useful for asyncSpawned futures, but works for any future. ### Sales module The sales module needed to subscribe to request events to ensure that the request queue was managed correctly on each event. In the process of doing this, the sales agents were updated to avoid subscribing to events in each agent, and instead dispatch received events from the sales module to all created sales agents. This would prevent memory leaks on having too many eventemitters subscribed to. - prevent removal of agents from sales module while stopping, otherwise the agents seq len is modified while iterating An additional sales agent state was added, `SalePreparing`, that handles all state machine setup, such as retrieving the request and subscribing to events that were previously in the `SaleDownloading` state. Once agents have parked in an end state (eg ignored, cancelled, finished, failed, errored), they were not getting cleaned up and the sales module was keeping a handle on their reference. An `onCleanUp` callback was created to be called after the state machine enters an end state, which could prevent a memory leak if the number of requests coming in is high. Move the SalesAgent callback raises pragmas from the Sales module to the proc definition in SalesAgent. This avoids having to catch `Exception`. - remove unneeded error handling as pragmas were moved Move sales.subscriptions from an object containing named subscriptions to a `seq[Subscription]` directly on the sales object. Sales tests: shut down repo after sales stop, to fix SIGABRT in CI ### Add async Promise API - modelled after JavaScript Promise API - alternative to `asyncSpawn` that allows handling of async calls in a synchronous context (including access to the synchronous closure) with less additional procs to be declared - Write less code, catch errors that would otherwise defect in asyncspawn, and execute a callback after completion - Add cancellation callbacks to utils/then, ensuring cancellations are handled properly ## Dependencies - bump codex-contracts-eth to support slot queue (https://github.com/codex-storage/codex-contracts-eth/pull/61) - bump nim-ethers to 0.5.0 - Bump nim-json-rpc submodule to 0bf2bcb --------- Co-authored-by: Jaremy Creechley <creechley@gmail.com>
345 lines
11 KiB
Nim
345 lines
11 KiB
Nim
import pkg/asynctest
|
|
import pkg/chronos
|
|
import pkg/questionable
|
|
import pkg/questionable/results
|
|
import codex/utils/then
|
|
import ../helpers
|
|
|
|
asyncchecksuite "then - Future[void]":
|
|
var returnsVoidWasRun: bool
|
|
var error = (ref CatchableError)(msg: "some error")
|
|
|
|
setup:
|
|
returnsVoidWasRun = false
|
|
|
|
proc returnsVoid() {.async.} =
|
|
await sleepAsync 1.millis
|
|
returnsVoidWasRun = true
|
|
|
|
proc returnsVoidError() {.async.} =
|
|
raise error
|
|
|
|
proc returnsVoidCancelled() {.async.} =
|
|
await sleepAsync(1.seconds)
|
|
|
|
proc wasCancelled(error: ref CancelledError): bool =
|
|
not error.isNil and error.msg == "Future operation cancelled!"
|
|
|
|
test "calls async proc when returns Future[void]":
|
|
discard returnsVoid().then(
|
|
proc(err: ref CatchableError) = discard
|
|
)
|
|
check eventually returnsVoidWasRun
|
|
|
|
test "calls onSuccess when Future[void] complete":
|
|
var onSuccessCalled = false
|
|
discard returnsVoid().then(
|
|
proc() = onSuccessCalled = true,
|
|
proc(err: ref CatchableError) = discard
|
|
)
|
|
check eventually returnsVoidWasRun
|
|
check eventually onSuccessCalled
|
|
|
|
test "can pass only onSuccess for Future[void]":
|
|
var onSuccessCalled = false
|
|
discard returnsVoid().then(
|
|
proc() = onSuccessCalled = true
|
|
)
|
|
check eventually returnsVoidWasRun
|
|
check eventually onSuccessCalled
|
|
|
|
test "can chain onSuccess when Future[void] complete":
|
|
var onSuccessCalledTimes = 0
|
|
discard returnsVoid()
|
|
.then(proc() = inc onSuccessCalledTimes)
|
|
.then(proc() = inc onSuccessCalledTimes)
|
|
.then(proc() = inc onSuccessCalledTimes)
|
|
check eventually onSuccessCalledTimes == 3
|
|
|
|
test "calls onError when Future[void] fails":
|
|
var errorActual: ref CatchableError
|
|
discard returnsVoidError().then(
|
|
proc() = discard,
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "calls onError when Future[void] fails":
|
|
var errorActual: ref CatchableError
|
|
discard returnsVoidError().then(
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "catch callback fired when Future[void] fails":
|
|
var errorActual: ref CatchableError
|
|
returnsVoidError().catch(
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "does not fire onSuccess callback when Future[void] fails":
|
|
var onSuccessCalled = false
|
|
|
|
returnsVoidError()
|
|
.then(proc() = onSuccessCalled = true)
|
|
.then(proc() = onSuccessCalled = true)
|
|
.catch(proc(e: ref CatchableError) = discard)
|
|
|
|
check always (not onSuccessCalled)
|
|
|
|
asyncchecksuite "then - Future[T]":
|
|
var returnsValWasRun: bool
|
|
var error = (ref CatchableError)(msg: "some error")
|
|
|
|
setup:
|
|
returnsValWasRun = false
|
|
|
|
proc returnsVal(): Future[int] {.async.} =
|
|
await sleepAsync 1.millis
|
|
returnsValWasRun = true
|
|
return 1
|
|
|
|
proc returnsValError(): Future[int] {.async.} =
|
|
raise error
|
|
|
|
proc returnsValCancelled(): Future[int] {.async.} =
|
|
await sleepAsync(1.seconds)
|
|
|
|
proc wasCancelled(error: ref CancelledError): bool =
|
|
not error.isNil and error.msg == "Future operation cancelled!"
|
|
|
|
test "calls onSuccess when Future[T] complete":
|
|
var returnedVal = 0
|
|
discard returnsVal().then(
|
|
proc(val: int) = returnedVal = val,
|
|
proc(err: ref CatchableError) = discard
|
|
)
|
|
check eventually returnsValWasRun
|
|
check eventually returnedVal == 1
|
|
|
|
test "can pass only onSuccess for Future[T]":
|
|
var returnedVal = 0
|
|
discard returnsVal().then(
|
|
proc(val: int) = returnedVal = val
|
|
)
|
|
check eventually returnsValWasRun
|
|
check eventually returnedVal == 1
|
|
|
|
test "can chain onSuccess when Future[T] complete":
|
|
var onSuccessCalledWith: seq[int] = @[]
|
|
discard returnsVal()
|
|
.then(proc(val: int) = onSuccessCalledWith.add(val))
|
|
.then(proc(val: int) = onSuccessCalledWith.add(val))
|
|
.then(proc(val: int) = onSuccessCalledWith.add(val))
|
|
check eventually onSuccessCalledWith == @[1, 1, 1]
|
|
|
|
test "calls onError when Future[T] fails":
|
|
var errorActual: ref CatchableError
|
|
discard returnsValError().then(
|
|
proc(val: int) = discard,
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "catch callback fired when Future[T] fails":
|
|
var errorActual: ref CatchableError
|
|
returnsValError().catch(
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "does not fire onSuccess callback when Future[T] fails":
|
|
var onSuccessCalled = false
|
|
|
|
returnsValError()
|
|
.then(proc(val: int) = onSuccessCalled = true)
|
|
.then(proc(val: int) = onSuccessCalled = true)
|
|
.catch(proc(e: ref CatchableError) = discard)
|
|
|
|
check always (not onSuccessCalled)
|
|
|
|
asyncchecksuite "then - Future[?!void]":
|
|
var returnsResultVoidWasRun: bool
|
|
var error = (ref CatchableError)(msg: "some error")
|
|
|
|
setup:
|
|
returnsResultVoidWasRun = false
|
|
|
|
proc returnsResultVoid(): Future[?!void] {.async.} =
|
|
await sleepAsync 1.millis
|
|
returnsResultVoidWasRun = true
|
|
return success()
|
|
|
|
proc returnsResultVoidError(): Future[?!void] {.async.} =
|
|
return failure(error)
|
|
|
|
|
|
proc returnsResultVoidErrorUncaught(): Future[?!void] {.async.} =
|
|
raise error
|
|
|
|
proc returnsResultVoidCancelled(): Future[?!void] {.async.} =
|
|
await sleepAsync(1.seconds)
|
|
return success()
|
|
|
|
proc wasCancelled(error: ref CancelledError): bool =
|
|
not error.isNil and error.msg == "Future operation cancelled!"
|
|
|
|
test "calls onSuccess when Future[?!void] complete":
|
|
var onSuccessCalled = false
|
|
discard returnsResultVoid().then(
|
|
proc() = onSuccessCalled = true,
|
|
proc(err: ref CatchableError) = discard
|
|
)
|
|
check eventually returnsResultVoidWasRun
|
|
check eventually onSuccessCalled
|
|
|
|
test "can pass only onSuccess for Future[?!void]":
|
|
var onSuccessCalled = false
|
|
discard returnsResultVoid().then(
|
|
proc() = onSuccessCalled = true
|
|
)
|
|
check eventually returnsResultVoidWasRun
|
|
check eventually onSuccessCalled
|
|
|
|
test "can chain onSuccess when Future[?!void] complete":
|
|
var onSuccessCalledTimes = 0
|
|
discard returnsResultVoid()
|
|
.then(proc() = inc onSuccessCalledTimes)
|
|
.then(proc() = inc onSuccessCalledTimes)
|
|
.then(proc() = inc onSuccessCalledTimes)
|
|
check eventually onSuccessCalledTimes == 3
|
|
|
|
test "calls onError when Future[?!void] fails":
|
|
var errorActual: ref CatchableError
|
|
discard returnsResultVoidError().then(
|
|
proc() = discard,
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
await sleepAsync(10.millis)
|
|
check eventually error == errorActual
|
|
|
|
test "calls onError when Future[?!void] fails":
|
|
var errorActual: ref CatchableError
|
|
discard returnsResultVoidError().then(
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "catch callback fired when Future[?!void] fails":
|
|
var errorActual: ref CatchableError
|
|
returnsResultVoidError().catch(
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "does not fire onSuccess callback when Future[?!void] fails":
|
|
var onSuccessCalled = false
|
|
|
|
returnsResultVoidError()
|
|
.then(proc() = onSuccessCalled = true)
|
|
.then(proc() = onSuccessCalled = true)
|
|
.catch(proc(e: ref CatchableError) = discard)
|
|
|
|
check always (not onSuccessCalled)
|
|
|
|
test "catch callback fired when Future[?!void] fails with uncaught error":
|
|
var errorActual: ref CatchableError
|
|
returnsResultVoidErrorUncaught().catch(
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
asyncchecksuite "then - Future[?!T]":
|
|
var returnsResultValWasRun: bool
|
|
var error = (ref CatchableError)(msg: "some error")
|
|
|
|
setup:
|
|
returnsResultValWasRun = false
|
|
|
|
proc returnsResultVal(): Future[?!int] {.async.} =
|
|
await sleepAsync 1.millis
|
|
returnsResultValWasRun = true
|
|
return success(2)
|
|
|
|
proc returnsResultValError(): Future[?!int] {.async.} =
|
|
return failure(error)
|
|
|
|
proc returnsResultValErrorUncaught(): Future[?!int] {.async.} =
|
|
raise error
|
|
|
|
proc returnsResultValCancelled(): Future[?!int] {.async.} =
|
|
await sleepAsync(1.seconds)
|
|
return success(3)
|
|
|
|
proc wasCancelled(error: ref CancelledError): bool =
|
|
not error.isNil and error.msg == "Future operation cancelled!"
|
|
|
|
test "calls onSuccess when Future[?!T] completes":
|
|
var actualVal = 0
|
|
discard returnsResultVal().then(
|
|
proc(val: int) = actualVal = val,
|
|
proc(err: ref CatchableError) = discard
|
|
)
|
|
check eventually returnsResultValWasRun
|
|
check eventually actualVal == 2
|
|
|
|
test "can pass only onSuccess for Future[?!T]":
|
|
var actualVal = 0
|
|
discard returnsResultVal().then(
|
|
proc(val: int) = actualVal = val
|
|
)
|
|
check eventually returnsResultValWasRun
|
|
check eventually actualVal == 2
|
|
|
|
test "can chain onSuccess when Future[?!T] complete":
|
|
var onSuccessCalledWith: seq[int] = @[]
|
|
discard returnsResultVal()
|
|
.then(proc(val: int) = onSuccessCalledWith.add val)
|
|
.then(proc(val: int) = onSuccessCalledWith.add val)
|
|
.then(proc(val: int) = onSuccessCalledWith.add val)
|
|
check eventually onSuccessCalledWith == @[2, 2, 2]
|
|
|
|
test "calls onError when Future[?!T] fails":
|
|
var errorActual: ref CatchableError
|
|
discard returnsResultValError().then(
|
|
proc(val: int) = discard,
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "calls onError when Future[?!T] fails":
|
|
var errorActual: ref CatchableError
|
|
discard returnsResultValError().then(
|
|
proc(val: int) = discard,
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "catch callback fired when Future[?!T] fails":
|
|
var errorActual: ref CatchableError
|
|
returnsResultValError().catch(
|
|
proc(e: ref CatchableError) = errorActual = e
|
|
)
|
|
check eventually error == errorActual
|
|
|
|
test "does not fire onSuccess callback when Future[?!T] fails":
|
|
var onSuccessCalled = false
|
|
|
|
returnsResultValError()
|
|
.then(proc(val: int) = onSuccessCalled = true)
|
|
.then(proc(val: int) = onSuccessCalled = true)
|
|
.catch(proc(e: ref CatchableError) = discard)
|
|
|
|
check always (not onSuccessCalled)
|
|
|
|
test "catch callback fired when Future[?!T] fails with uncaught error":
|
|
var errorActual: ref CatchableError
|
|
|
|
returnsResultValErrorUncaught()
|
|
.then(proc(val: int) = discard)
|
|
.then(proc(val: int) = discard)
|
|
.catch(proc(e: ref CatchableError) = errorActual = e)
|
|
|
|
check eventually error == errorActual
|