feat(host-agent): renew active assignment leases
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Callable
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Any
|
||||
|
||||
@@ -19,11 +20,21 @@ class AssignmentExecutor:
|
||||
def __init__(self, factories: ExecutionFactories) -> None:
|
||||
self.factories = factories
|
||||
|
||||
def execute(self, assignment: AssignmentModel) -> AssignmentExecutionResult:
|
||||
def execute(
|
||||
self,
|
||||
assignment: AssignmentModel,
|
||||
*,
|
||||
should_stop: Callable[[], bool] | None = None,
|
||||
) -> AssignmentExecutionResult:
|
||||
if should_stop is not None and should_stop():
|
||||
return AssignmentExecutionResult(
|
||||
status="failed",
|
||||
failure_reason="execution interrupted",
|
||||
)
|
||||
if assignment.workflow_definition_id is not None:
|
||||
return self._execute_workflow(assignment)
|
||||
return self._execute_workflow(assignment, should_stop=should_stop)
|
||||
if assignment.goal is not None:
|
||||
return self._execute_goal(assignment)
|
||||
return self._execute_goal(assignment, should_stop=should_stop)
|
||||
return AssignmentExecutionResult(
|
||||
status="failed",
|
||||
failure_reason="assignment has neither goal nor workflow definition",
|
||||
@@ -32,9 +43,15 @@ class AssignmentExecutor:
|
||||
def _execute_goal(
|
||||
self,
|
||||
assignment: AssignmentModel,
|
||||
*,
|
||||
should_stop: Callable[[], bool] | None,
|
||||
) -> AssignmentExecutionResult:
|
||||
task = Task(goal=assignment.goal or "", device_id=assignment.device_id)
|
||||
completed = self.factories.task_runner_factory().run(task)
|
||||
runner = self.factories.task_runner_factory()
|
||||
if should_stop is None:
|
||||
completed = runner.run(task)
|
||||
else:
|
||||
completed = runner.run(task, should_stop=should_stop)
|
||||
return AssignmentExecutionResult(
|
||||
status="done" if completed.status == "completed" else "failed",
|
||||
failure_reason=completed.failure_reason,
|
||||
@@ -47,6 +64,8 @@ class AssignmentExecutor:
|
||||
def _execute_workflow(
|
||||
self,
|
||||
assignment: AssignmentModel,
|
||||
*,
|
||||
should_stop: Callable[[], bool] | None,
|
||||
) -> AssignmentExecutionResult:
|
||||
definition_id = assignment.workflow_definition_id or ""
|
||||
definition = self.factories.workflow_store.get_definition(definition_id)
|
||||
@@ -55,10 +74,15 @@ class AssignmentExecutor:
|
||||
status="failed",
|
||||
failure_reason=f"unknown workflow definition {definition_id!r}",
|
||||
)
|
||||
run = self.factories.workflow_runner_factory().run(
|
||||
definition,
|
||||
device_id=assignment.device_id,
|
||||
)
|
||||
runner = self.factories.workflow_runner_factory()
|
||||
if should_stop is None:
|
||||
run = runner.run(definition, device_id=assignment.device_id)
|
||||
else:
|
||||
run = runner.run(
|
||||
definition,
|
||||
device_id=assignment.device_id,
|
||||
should_stop=should_stop,
|
||||
)
|
||||
return AssignmentExecutionResult(
|
||||
status="done" if run.status == "completed" else "failed",
|
||||
failure_reason=(
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
from collections.abc import Callable
|
||||
from datetime import UTC, datetime
|
||||
from threading import Event, Lock
|
||||
from typing import Protocol
|
||||
|
||||
import httpx
|
||||
|
||||
from cloud.internal_api.models import AssignmentModel
|
||||
from host_agent.assignment import AssignmentExecutionResult
|
||||
from host_agent.client import HostAgentAPIError, HostAgentClient, StaleLeaseError
|
||||
|
||||
|
||||
class InterruptibleAssignmentExecutor(Protocol):
|
||||
def execute(
|
||||
self,
|
||||
assignment: AssignmentModel,
|
||||
*,
|
||||
should_stop: Callable[[], bool] | None = None,
|
||||
) -> AssignmentExecutionResult: ...
|
||||
|
||||
|
||||
class LeaseGuard:
|
||||
def __init__(self) -> None:
|
||||
self._lost = Event()
|
||||
self._lock = Lock()
|
||||
self._reason: str | None = None
|
||||
|
||||
@property
|
||||
def reason(self) -> str | None:
|
||||
with self._lock:
|
||||
return self._reason
|
||||
|
||||
def is_lost(self) -> bool:
|
||||
return self._lost.is_set()
|
||||
|
||||
def mark_lost(self, reason: str) -> None:
|
||||
with self._lock:
|
||||
if self._reason is None:
|
||||
self._reason = reason
|
||||
self._lost.set()
|
||||
|
||||
|
||||
class ActiveAssignmentRunner:
|
||||
def __init__(
|
||||
self,
|
||||
client: HostAgentClient,
|
||||
executor: InterruptibleAssignmentExecutor,
|
||||
*,
|
||||
now: Callable[[], datetime] | None = None,
|
||||
) -> None:
|
||||
self.client = client
|
||||
self.executor = executor
|
||||
self._now = now or (lambda: datetime.now(UTC))
|
||||
|
||||
async def run(self, assignment: AssignmentModel) -> AssignmentExecutionResult:
|
||||
guard = LeaseGuard()
|
||||
execution = asyncio.create_task(
|
||||
asyncio.to_thread(
|
||||
self.executor.execute,
|
||||
assignment,
|
||||
should_stop=guard.is_lost,
|
||||
)
|
||||
)
|
||||
renewal = asyncio.create_task(
|
||||
self._renew_while_running(assignment, execution, guard)
|
||||
)
|
||||
try:
|
||||
return await execution
|
||||
finally:
|
||||
await renewal
|
||||
|
||||
async def _renew_while_running(
|
||||
self,
|
||||
assignment: AssignmentModel,
|
||||
execution: asyncio.Task[AssignmentExecutionResult],
|
||||
guard: LeaseGuard,
|
||||
) -> None:
|
||||
lease_expires_at = assignment.lease_expires_at
|
||||
while not execution.done():
|
||||
delay = max(
|
||||
0.0,
|
||||
(lease_expires_at - self._now()).total_seconds() / 3,
|
||||
)
|
||||
done, _ = await asyncio.wait({execution}, timeout=delay)
|
||||
if done:
|
||||
return
|
||||
try:
|
||||
response = await self.client.renew(assignment)
|
||||
except StaleLeaseError:
|
||||
guard.mark_lost("lease rejected by control plane")
|
||||
return
|
||||
except HostAgentAPIError as exc:
|
||||
guard.mark_lost(f"lease renewal rejected: {exc.detail}")
|
||||
return
|
||||
except httpx.TransportError:
|
||||
guard.mark_lost("lease renewal failed after transport retries")
|
||||
return
|
||||
else:
|
||||
lease_expires_at = response.lease_expires_at
|
||||
Reference in New Issue
Block a user