bhetherman/localthings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

observe: assign fallback_hrefs under the notify lock

Browse Source 
on_notification discards on the DTLS reader thread. Snapshotting
_notified then assigning fallback_hrefs after releasing the lock
let a notify in that window land on the set object being replaced,
so a just-pushed href was classified silent until its next notify.
This commit is contained in:
JayChickenK
2026-08-19 22:22:11 +02:00
parent 35f144a2d1
commit 4edd5b7866
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
custom_components/localthings/observe.py
+6 -6
View File
@@ -96,7 +96,8 @@ class ObserveManager:
self._last_notify_ts: float | None = None self._last_notify_ts: float | None = None
# Wakes try_enter_observe_mode's grace wait early once enough hrefs # Wakes try_enter_observe_mode's grace wait early once enough hrefs
# have notified. Guards `_notified` mutations, the `wait_for`, and # have notified. Guards `_notified` mutations, the `wait_for`, and
# fallback_hrefs discards from on_notification. # fallback_hrefs (enter_observe_mode assignment, on_notification
# discard).
self._notify_cond = threading.Condition() self._notify_cond = threading.Condition()
# Idle while polling, except after downgrade_to_poll (every href # Idle while polling, except after downgrade_to_poll (every href
# that was subscribed). While in observe mode this is the set of # that was subscribed). While in observe mode this is the set of
@@ -280,14 +281,13 @@ class ObserveManager:
#294) -- committing against a session a reconnect already replaced #294) -- committing against a session a reconnect already replaced
would claim observe mode with nothing left to notice it's dead.""" would claim observe mode with nothing left to notice it's dead."""
self.subscribed_hrefs = set(subscribed) self.subscribed_hrefs = set(subscribed)
with self._notify_cond:
notified = set(self._notified)
# Issue #92: subscribed-but-silent hrefs are counted as covered by # Issue #92: subscribed-but-silent hrefs are counted as covered by
# push if we drop this, but they never emit a notify. Keep them on # push if we drop this, but they never emit a notify. Keep them on
# the poll cadence via fallback_hrefs (otherwise idle in observe). # the poll cadence via fallback_hrefs (otherwise idle in observe).
# This is the 80% quorum snapshot; a later notify discards the # Same lock as on_notification's discard so a notify in this window
# href in on_notification. # cannot land on a set object that is about to be replaced.
self.fallback_hrefs = set(subscribed) - notified with self._notify_cond:
self.fallback_hrefs = set(subscribed) - self._notified
self._set_mode(MODE_OBSERVE) self._set_mode(MODE_OBSERVE)
self.start_refresh_task(session) self.start_refresh_task(session)