observe: keep silent hrefs on the sub-poll cadence
Issue #92: try_enter_observe_mode treated every subscribed href as push-covered once SUCCESS_FRACTION cleared, including ones that never notified. Those then skipped _run_subpolls for the rest of the session. Record subscribed-but-silent hrefs on fallback_hrefs (idle in observe mode) and keep just that set on the hot/warm cadence.
This commit is contained in:
1 parent
01c9dc9801
commit
9a45afe949
4 files changed
+102
-9
No files matched your search
@@ -975,16 +975,23 @@ class LocalThingsCoordinator(DataUpdateCoordinator[dict[str, Any]]):
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
async def _run_subpolls(self, force: bool = False) -> None:
|
||||
"""Poll hot/warm hrefs in the gaps between summary polls. No-op in
|
||||
observe-primary mode (those hrefs are already covered by push)
|
||||
unless `force` is set -- set when this cycle's sweep found the
|
||||
cache disagreeing with a still-live observe session (see
|
||||
log_sweep_discrepancies): a bounded fallback for a channel gone
|
||||
silent without a reconnect."""
|
||||
"""Poll hot/warm hrefs in the gaps between summary polls.
|
||||
|
||||
In observe-primary mode this is a no-op for hrefs the device is
|
||||
actually pushing, unless `force` is set (sweep disagreed with the
|
||||
cache -- see log_sweep_discrepancies). Hrefs that were subscribed
|
||||
but stayed silent through the grace period (issue #92) stay on
|
||||
the hot/warm cadence via `fallback_hrefs`.
|
||||
"""
|
||||
if self._observe.mode == MODE_OBSERVE and not force:
|
||||
return
|
||||
hot = self._hot_hrefs
|
||||
warm = self._warm_hrefs
|
||||
silent = self._observe.fallback_hrefs
|
||||
if not silent:
|
||||
return
|
||||
hot = [h for h in self._hot_hrefs if h in silent]
|
||||
warm = [h for h in self._warm_hrefs if h in silent]
|
||||
else:
|
||||
hot = self._hot_hrefs
|
||||
warm = self._warm_hrefs
|
||||
if not hot and not warm:
|
||||
return
|
||||
step = self._SUBPOLL_STEP_S
|
||||
|
||||
@@ -97,6 +97,11 @@ class ObserveManager:
|
||||
# Wakes try_enter_observe_mode's grace wait early once enough hrefs
|
||||
# have notified. Guards only `_notified` mutations + the `wait_for`.
|
||||
self._notify_cond = threading.Condition()
|
||||
# Idle while polling, except after downgrade_to_poll (every href
|
||||
# that was subscribed). While in observe mode this is the set of
|
||||
# hrefs that were subscribed but never notified during the grace
|
||||
# period (issue #92) -- they stay on the hot/warm sub-poll cadence
|
||||
# instead of waiting for the 30s /device/0 sweep.
|
||||
self.fallback_hrefs: set[str] = set()
|
||||
self._on_applied: Callable[[str, dict, str], None] | None = None
|
||||
self._refresh_task: ObserveRefreshTask | None = None
|
||||
@@ -270,6 +275,12 @@ class ObserveManager:
|
||||
#294) -- committing against a session a reconnect already replaced
|
||||
would claim observe mode with nothing left to notice it's dead."""
|
||||
self.subscribed_hrefs = set(subscribed)
|
||||
with self._notify_cond:
|
||||
notified = set(self._notified)
|
||||
# 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
|
||||
# the poll cadence via fallback_hrefs (otherwise idle in observe).
|
||||
self.fallback_hrefs = set(subscribed) - notified
|
||||
self._set_mode(MODE_OBSERVE)
|
||||
self.start_refresh_task(session)
|
||||
|
||||
|
||||
Reference in new issue
Block a user