Engine holds for a rename: the pipeline refuses publish and inline cascades with EngineHeld once those running have finished, the execution service stops claiming and its timers once claimed cascades have finished; both wait without a limit, report what is busy and can be aborted. REST answers 503 with Retry-After, a device frame busy. Redis adds no longer wait for each other, only a queue hold waits for them
This commit is contained in:
@@ -756,12 +756,15 @@ class RedisWorkQueue(WorkQueue):
|
||||
self._held_key = f"{namespace}:__held__"
|
||||
self._move_due = self._redis.register_script(_MOVE_DUE)
|
||||
self._release = self._redis.register_script(_RELEASE)
|
||||
# `add` reads the flag and writes under this, and `release` empties the
|
||||
# held list and clears the flag under it. So nothing added after `hold`
|
||||
# lands in a stream a rename is rebuilding, and nothing added while
|
||||
# held overtakes held work.
|
||||
self._hold_lock = threading.Lock()
|
||||
# `add` reads the flag under this, and counts an `XADD` in `_adding`
|
||||
# until it is done, so adds from parallel producers do not wait for
|
||||
# each other. `hold` sets the flag and waits for `_adding` to reach 0,
|
||||
# and `release` empties the held list and clears the flag under it. So
|
||||
# nothing added after `hold` lands in a stream a rename is rebuilding,
|
||||
# and nothing added while held overtakes held work.
|
||||
self._hold_lock = threading.Condition()
|
||||
self._holding = False
|
||||
self._adding = 0
|
||||
self._ensure_group()
|
||||
self._drop_stale_consumers()
|
||||
|
||||
@@ -811,12 +814,18 @@ class RedisWorkQueue(WorkQueue):
|
||||
if self._holding:
|
||||
self._redis.rpush(self._held_key, orjson.dumps(item.to_fields()))
|
||||
return
|
||||
self._adding += 1
|
||||
try:
|
||||
self._redis.xadd(
|
||||
self._stream,
|
||||
cast(Any, item.to_fields()),
|
||||
maxlen=STREAM_MAXLEN,
|
||||
approximate=True,
|
||||
)
|
||||
finally:
|
||||
with self._hold_lock:
|
||||
self._adding -= 1
|
||||
self._hold_lock.notify_all()
|
||||
|
||||
def add_delayed(self, item: WorkItem, not_before: float) -> None:
|
||||
item.not_before = not_before
|
||||
@@ -1154,6 +1163,8 @@ class RedisWorkQueue(WorkQueue):
|
||||
def hold(self) -> None:
|
||||
with self._hold_lock:
|
||||
self._holding = True
|
||||
while self._adding:
|
||||
self._hold_lock.wait()
|
||||
|
||||
def release(self) -> None:
|
||||
with self._hold_lock:
|
||||
|
||||
Reference in New Issue
Block a user