The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(config): remote backend — no st.lock across migrations, re-arm poller after fork, classify poll refusals by status
Ben Barclayfa08fa90d068
diff --git a/plugins/config_backends/remote/backend.py b/plugins/config_backends/remote/backend.pyindex cc8b5ef3716..9154d735acc 100644--- a/plugins/config_backends/remote/backend.py+++ b/plugins/config_backends/remote/backend.py@@ -119,6 +119,8 @@ class RemoteBackend:key = self._key(home)st = self._states.get(key)if st is not None:+ if self._poller_pid != os.getpid(): # a forked child has no poller thread+ self._ensure_poller()return stwith self._lock:fetch_lock = self._fetch_locks.setdefault(key, threading.Lock())@@ -209,30 +211,33 @@ class RemoteBackend:when the boot fetch runs."""if st.postprocessed or st.in_postprocess:return+ # The flag, not st.lock, guards the work: a migration reads through hermes_cli.config (its+ # _CONFIG_LOCK), and holding st.lock across that could deadlock against a writer that holds+ # _CONFIG_LOCK and waits for st.lock. A concurrent reader meanwhile gets the unmigrated doc.with st.lock:if st.postprocessed or st.in_postprocess:returnst.in_postprocess = True+ etag = st.etag+ try:try:from hermes_cli.config import _known_top_level_keysfrom hermes_cli.config_migrations import SUPPORT_FLOOR_VERSION, run_migrationsexcept ImportError:- st.in_postprocess = Falsereturn # still importing; the next read retries- try:- for key in sorted(set(st.doc) - _known_top_level_keys() - {"_config_version"}):- if key not in self._unknown_warned:- self._unknown_warned.add(key)- logger.warning("Remote Config: unknown config key %r is ignored by this Hermes version", key)- current, latest = int(st.doc.get("_config_version") or 0), _latest_config_version()- if SUPPORT_FLOOR_VERSION <= current < latest:- self._migrate_in_memory(st, current, run_migrations)- elif current < SUPPORT_FLOOR_VERSION:- logger.warning("Remote Config: profile %r was written by config version %d, below the "- "migration floor %d; not migrated", st.profile, current, SUPPORT_FLOOR_VERSION)- st.postprocessed = True- finally:- st.in_postprocess = False+ for key in sorted(set(st.doc) - _known_top_level_keys() - {"_config_version"}):+ if key not in self._unknown_warned:+ self._unknown_warned.add(key)+ logger.warning("Remote Config: unknown config key %r is ignored by this Hermes version", key)+ current, latest = int(st.doc.get("_config_version") or 0), _latest_config_version()+ if SUPPORT_FLOOR_VERSION <= current < latest:+ self._migrate_in_memory(st, current, run_migrations)+ elif current < SUPPORT_FLOOR_VERSION:+ logger.warning("Remote Config: profile %r was written by config version %d, below the "+ "migration floor %d; not migrated", st.profile, current, SUPPORT_FLOOR_VERSION)+ st.postprocessed = st.etag == etag # a poll that landed meanwhile needs its own pass+ finally:+ st.in_postprocess = Falsedef _migrate_in_memory(self, st: _ProfileState, current: int, run_migrations) -> None:from hermes_constants import reset_hermes_home_override, set_hermes_home_overridediff --git a/tests/plugins/config_backends/test_remote_backend.py b/tests/plugins/config_backends/test_remote_backend.pyindex f200ff7a34c..73587ee1655 100644--- a/tests/plugins/config_backends/test_remote_backend.py+++ b/tests/plugins/config_backends/test_remote_backend.py@@ -337,6 +337,19 @@ def test_poll_refusal_logs_error_but_keeps_running(plane, caplog):assert [r.levelname for r in caplog.records if "poll for profile" in r.getMessage()] == ["WARNING"]+def test_forked_child_rearms_its_poller(plane):+ import os++ from hermes_cli.config import load_config+ load_config()+ backend = remote_pkg.get_remote_backend()+ first = backend._poller+ backend._poller_pid = -1 # as in a child after fork: the parent's thread did not survive+ load_config()+ assert backend._poller_pid == os.getpid() and backend._poller is not first+ assert backend._poller is not None and backend._poller.is_alive()++def test_poll_interval_floor(monkeypatch):monkeypatch.setenv("HERMES_CONFIG_REMOTE_POLL_SECONDS", "1")assert backend_mod.poll_interval() == backend_mod.MIN_POLL_SECONDS