Skip to content

The agent that grows with you

fix(raft): the raft bridge dies with the gateway that started it (orphans after kill -9: 1 -> 0)

kshitijk4poor9c0641eb47a9
diff --git a/plugins/platforms/raft/adapter.py b/plugins/platforms/raft/adapter.py
index af5561fe65c..4765f0fc8b8 100644
--- a/plugins/platforms/raft/adapter.py
+++ b/plugins/platforms/raft/adapter.py
@@ -40,6 +40,7 @@ from gateway.config import Platform, PlatformConfig
from gateway.platforms.base import BasePlatformAdapter, SendResult, merge_pending_message_event
from gateway.platforms.event import MessageEvent, MessageType
from gateway.platforms._shared import coerce_port, profile_scoped as _profile_scoped
+from hermes_cli.process_identity import release_process_groups, spawn_owned
logger = logging.getLogger(__name__)
@@ -381,7 +382,9 @@ class RaftAdapter(BasePlatformAdapter):
env = {**hermes_subprocess_env(), "RAFT_PROFILE": profile, "RAFT_CHANNEL_TOKEN": self._bridge_token}
env["HOME"] = env["HERMES_REAL_HOME"] # the raft CLI's own login lives under the user's HOME
try:
- self._bridge_process = subprocess.Popen(cmd, env=env, stdin=subprocess.DEVNULL)
+ # Owned: the bridge dies with this gateway however it dies (a SIGKILLed or OOM-killed
+ # gateway used to leave `raft agent bridge` polling Raft for a channel nobody serves).
+ self._bridge_process = spawn_owned(cmd, purpose="raft-bridge", env=env, stdin=subprocess.DEVNULL)
logger.info("[raft] Spawned bridge pid=%d profile=%s endpoint=%s", self._bridge_process.pid, profile, endpoint)
except Exception:
logger.exception("[raft] Failed to spawn bridge")
@@ -399,6 +402,9 @@ class RaftAdapter(BasePlatformAdapter):
logger.warning("[raft] Bridge process killed after timeout (pid=%d)", proc.pid)
except Exception:
logger.exception("[raft] Error stopping bridge")
+ if proc.poll() is not None:
+ # Stopped by us; a bridge we failed to stop stays covered by the owner-death supervisor.
+ release_process_groups([proc.pid])
async def send(self, chat_id: str, content: str, reply_to: Optional[str] = None,
metadata: Optional[dict[str, Any]] = None) -> SendResult:
diff --git a/tests/gateway/test_raft_adapter.py b/tests/gateway/test_raft_adapter.py
index 4405438e5f8..d3c4a2a1cab 100644
--- a/tests/gateway/test_raft_adapter.py
+++ b/tests/gateway/test_raft_adapter.py
@@ -262,7 +262,7 @@ class TestMultiplexProfileScope:
monkeypatch.setattr(raft_mod.shutil, "which", lambda name: "/usr/bin/raft")
spawned = []
monkeypatch.setattr(
- raft_mod.subprocess, "Popen",
+ raft_mod, "spawn_owned",
lambda cmd, **kwargs: spawned.append(cmd) or SimpleNamespace(pid=1),
)
diff --git a/tests/hermes_cli/test_owned_agent_subprocs.py b/tests/hermes_cli/test_owned_agent_subprocs.py
index 190ae26cca2..f8ee2453b1b 100644
--- a/tests/hermes_cli/test_owned_agent_subprocs.py
+++ b/tests/hermes_cli/test_owned_agent_subprocs.py
@@ -43,6 +43,18 @@ _OWNERS = {
"from plugins.platforms.whatsapp.adapter import _spawn_bridge_process\n"
"_spawn_bridge_process(child, open(out / 'bridge.log', 'a', encoding='utf-8'), dict(os.environ))\n"
),
+ # `raft` on PATH is a wrapper that execs the child; the adapter appends its own bridge argv.
+ "raft-bridge": (
+ "bindir = out / 'bin'; bindir.mkdir()\n"
+ "(bindir / 'raft').write_text('#!/bin/sh\\nexec ' + child_cmd + '\\n', encoding='utf-8')\n"
+ "(bindir / 'raft').chmod(0o755)\n"
+ "os.environ['PATH'] = str(bindir) + os.pathsep + os.environ['PATH']\n"
+ "os.environ['RAFT_PROFILE'] = 'test'\n"
+ "from plugins.platforms.raft.adapter import RaftAdapter\n"
+ "a = RaftAdapter.__new__(RaftAdapter)\n"
+ "a._host, a._path, a._bridge_token, a._bridge_process = '127.0.0.1', '/wake', 't', None\n"
+ "a._spawn_bridge(1)\n"
+ ),
}
@@ -146,3 +158,19 @@ async def test_whatsapp_disconnect_releases_the_bridge_it_stopped(monkeypatch):
assert released == [[bridge.pid]]
finally:
_reap(bridge)
+
+
+def test_raft_stop_releases_the_bridge_it_stopped(monkeypatch):
+ from plugins.platforms.raft import adapter as raft
+
+ released = []
+ monkeypatch.setattr(raft, "release_process_groups", lambda pgids: released.append(list(pgids)))
+ bridge = _sleeper()
+ a = raft.RaftAdapter.__new__(raft.RaftAdapter)
+ a._bridge_process = bridge
+ try:
+ a._stop_bridge()
+ assert bridge.poll() is not None, "_stop_bridge() left the bridge running"
+ assert released == [[bridge.pid]]
+ finally:
+ _reap(bridge)