Bah, fix nursery indents for maybe tsdb backloading

Can't ref `dt_eps` and `tsdb_entry` if they don't exist.. like for 1s
sampling from `binance` (which dne). So make sure to add better logic
guard and only open the finaly backload nursery if we actually need to
fill the gap between latest history and where tsdb history ends.

TO CHERRY #486
distribute_dis
Tyler Goodlet 2023-12-18 19:46:59 -05:00
parent f7cc43ee0b
commit 659649ec48
1 changed files with 35 additions and 28 deletions

View File

@ -891,44 +891,49 @@ async def tsdb_backfill(
config, config,
) )
# tell parent task to continue
# TODO: really we'd want this the other way with the
# tsdb load happening asap and the since the latest
# frame query will normally be the main source of
# latency?
task_status.started()
tsdb_entry: tuple = await load_tsdb_hist( tsdb_entry: tuple = await load_tsdb_hist(
storage, storage,
mkt, mkt,
timeframe, timeframe,
) )
# tell parent task to continue
# TODO: really we'd want this the other way with the
# tsdb load happening asap and the since the latest
# frame query will normally be the main source of
# latency?
task_status.started()
# NOTE: iabs to start backfilling from, reverse chronological, # NOTE: iabs to start backfilling from, reverse chronological,
# ONLY AFTER the first history frame has been pushed to # ONLY AFTER the first history frame has been pushed to
# mem! # mem!
backfill_gap_from_shm_index: int = shm._first.value + 1 backfill_gap_from_shm_index: int = shm._first.value + 1
( # Prepend any tsdb history to the shm buffer which should
mr_start_dt, # now be full of the most recent history pulled from the
mr_end_dt, # backend's last frame.
) = dt_eps if (
dt_eps
and tsdb_entry
):
# unpack both the latest (gap) backfilled frame dts
(
mr_start_dt,
mr_end_dt,
) = dt_eps
async with trio.open_nursery() as tn: # AND the tsdb history from (offline) storage)
(
tsdb_history,
first_tsdb_dt,
last_tsdb_dt,
) = tsdb_entry
# Prepend any tsdb history to the shm buffer which should # if there is a gap to backfill from the first
# now be full of the most recent history pulled from the # history frame until the last datum loaded from the tsdb
# backend's last frame. # continue that now in the background
if tsdb_entry: async with trio.open_nursery() as tn:
(
tsdb_history,
first_tsdb_dt,
last_tsdb_dt,
) = tsdb_entry
# if there is a gap to backfill from the first
# history frame until the last datum loaded from the tsdb
# continue that now in the background
bf_done = await tn.start( bf_done = await tn.start(
partial( partial(
start_backfill, start_backfill,
@ -941,8 +946,10 @@ async def tsdb_backfill(
backfill_from_shm_index=backfill_gap_from_shm_index, backfill_from_shm_index=backfill_gap_from_shm_index,
backfill_from_dt=mr_start_dt, backfill_from_dt=mr_start_dt,
sampler_stream=sampler_stream, sampler_stream=sampler_stream,
backfill_until_dt=last_tsdb_dt, backfill_until_dt=last_tsdb_dt,
storage=storage, storage=storage,
write_tsdb=True, write_tsdb=True,
) )
@ -1032,11 +1039,11 @@ async def tsdb_backfill(
mkt=mkt, mkt=mkt,
)) ))
# 2nd nursery END
# TODO: who would want to? # TODO: who would want to?
await nulls_detected.wait() await nulls_detected.wait()
await bf_done.wait()
await bf_done.wait()
# TODO: maybe start history anal and load missing "history # TODO: maybe start history anal and load missing "history
# gaps" via backend.. # gaps" via backend..