mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-10-26 13:16:24 +00:00
eb7c342fb1
* fix(sandbox): measure warm-pool idle age on a monotonic clock Warm-pool expiry measures a duration, but every provider stamped and reaped entries using the wall clock. A forward correction could therefore destroy fresh sandboxes, while a backward correction could retain expired ones until the clock caught up. Move every warm-pool writer and reader to time.monotonic(), including the Tenki and OpenSandbox reset paths missed by the earlier closed attempt. Keep absolute SandboxInfo.created_at and reconciliation grace timestamps on the wall clock. Convert AIO's sibling active-idle timestamps as one clock domain, and update finite clock mocks for the additional duration read. Fixes #6970 * test(sandbox): keep active-idle race fixtures in the monotonic domain The production AIO activity clock moved to monotonic time, but the shared orphan-reconciliation helper still stamped active fixtures with wall time. CI then computed a negative idle age, so two teardown race tests never reached the ownership gate. Use the same monotonic domain as production. * test(sandbox): read warm-pool idle fixtures on the monotonic clock The idle-age conversion left several fixtures seeding the fields the reaper now reads with values from the clock it no longer reads: - `test_idle_reaping_forces_a_new_remote` froze `warm_pool_lifecycle.time.time`, so the benchmark's reaper compared against real elapsed monotonic seconds — zero over the test's lifetime. Nothing expired, the entry survived, and the second turn came back as a warm hit. - Three orphan-reconciliation fixtures seeded `_last_activity` with `0.0` and two aio fixtures with `time.time()`, both of which are far below a running monotonic clock: the computed idle age went negative, so the reaper never reached the ownership claim these tests are built to exercise. Seed them from `time.monotonic()` instead, and keep `created_at` (a wall-clock field) on `time.time()`.
291 lines
12 KiB
Python
291 lines
12 KiB
Python
"""Exercise the benchmark through the real provider with an offline SDK transport."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import threading
|
|
import time
|
|
from datetime import timedelta
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
|
|
from deerflow.community.opensandbox import provider as provider_module
|
|
from deerflow.config.app_config import AppConfig, get_app_config, pop_current_app_config, push_current_app_config
|
|
from deerflow.config.sandbox_config import SandboxConfig
|
|
from scripts.benchmark.sandbox import bench_provider as bench
|
|
from scripts.benchmark.sandbox import summarize
|
|
|
|
|
|
class Remote:
|
|
def __init__(self, number):
|
|
self.id = f"offline-remote-{number}"
|
|
self.destroy_calls = 0
|
|
self.destroy_error = False
|
|
self.command_error = False
|
|
self.commands = SimpleNamespace(run=self.run)
|
|
self.state = ""
|
|
|
|
def run(self, command, **kwargs):
|
|
if self.command_error:
|
|
raise RuntimeError("offline command failure")
|
|
if "__DF_OUTPUT_SYNC__" in command:
|
|
output = "\n__DF_OUTPUT_SYNC__:0:0:0"
|
|
elif 'write_text("benchmark-state-42")' in command:
|
|
self.state = "benchmark-state-42"
|
|
output = "written"
|
|
elif 'Path("/tmp/warm_state.txt").read_text()' in command:
|
|
output = self.state
|
|
else:
|
|
output = ""
|
|
return SimpleNamespace(exit_code=0, logs=SimpleNamespace(stdout=[SimpleNamespace(text=output)], stderr=[]), result=[])
|
|
|
|
def renew(self, timeout):
|
|
pass
|
|
|
|
def destroy(self):
|
|
self.destroy_calls += 1
|
|
if self.destroy_error:
|
|
raise RuntimeError("sentinel-private-sdk-error")
|
|
|
|
|
|
@pytest.fixture
|
|
def transport(monkeypatch, tmp_path):
|
|
remotes = []
|
|
requests = []
|
|
lock = threading.Lock()
|
|
|
|
def create(image, **kwargs):
|
|
with lock:
|
|
remote = Remote(len(remotes) + 1)
|
|
remotes.append(remote)
|
|
requests.append({"image": image, **kwargs})
|
|
return remote
|
|
|
|
monkeypatch.setattr(provider_module, "_import_sdk", lambda: (SimpleNamespace(create=create), SimpleNamespace, SimpleNamespace))
|
|
monkeypatch.setenv("DEER_FLOW_HOME", str(tmp_path / "home"))
|
|
config = AppConfig(
|
|
sandbox=SandboxConfig(
|
|
use="deerflow.community.opensandbox:OpenSandboxProvider",
|
|
image="test-image@sha256:fixture",
|
|
api_key="sentinel-api-key",
|
|
domain="sandbox.invalid:443",
|
|
protocol="https",
|
|
request_timeout=17,
|
|
ready_timeout=19,
|
|
use_server_proxy=True,
|
|
environment={"BENCH_SECRET": "sentinel-environment"},
|
|
)
|
|
)
|
|
push_current_app_config(config)
|
|
try:
|
|
yield SimpleNamespace(remotes=remotes, requests=requests, config=config)
|
|
finally:
|
|
pop_current_app_config()
|
|
|
|
|
|
def test_factory_preserves_connection_config_without_exporting_secrets(transport):
|
|
provider, snapshot = bench._make_opensandbox_provider({"replicas": 2, "idle_timeout": 0, "image": None})
|
|
try:
|
|
assert get_app_config() is transport.config
|
|
assert transport.config.sandbox.image == "test-image@sha256:fixture"
|
|
sid = provider.acquire("thread", user_id="owner")
|
|
request = transport.requests[0]
|
|
assert request["image"] == "test-image@sha256:fixture"
|
|
assert request["env"] == {"BENCH_SECRET": "sentinel-environment"}
|
|
assert vars(request["connection_config"]) == {
|
|
"api_key": "sentinel-api-key",
|
|
"domain": "sandbox.invalid:443",
|
|
"protocol": "https",
|
|
"request_timeout": timedelta(seconds=17),
|
|
"use_server_proxy": True,
|
|
}
|
|
assert request["ready_timeout"].total_seconds() == 19
|
|
assert snapshot == {"image": request["image"], "replicas": 2, "idle_timeout": 0}
|
|
assert "sentinel" not in json.dumps(snapshot)
|
|
provider.release(sid)
|
|
finally:
|
|
provider.shutdown()
|
|
|
|
|
|
@pytest.mark.parametrize("cold", [False, True])
|
|
def test_cli_measures_real_reclaim_and_destroys_all_created_remotes(transport, tmp_path, cold):
|
|
output = tmp_path / "results.jsonl"
|
|
args = ["--provider", "opensandbox", "--iterations", "2", "--idle-timeout", "0", "--output", str(output)]
|
|
if cold:
|
|
args.append("--no-warmpool")
|
|
assert bench.main(args) == 0
|
|
rows = [json.loads(line) for line in output.read_text(encoding="utf-8").splitlines()]
|
|
assert [row["warm_hit"] for row in rows] == [False, not cold]
|
|
assert all(row["success"] and row["provider"] == "opensandbox" for row in rows)
|
|
assert all(row["health_check_skip_seconds"] is None for row in rows)
|
|
# One separate warm-up remote, then two cold remotes or one reused remote.
|
|
assert len(transport.remotes) == (3 if cold else 2)
|
|
assert all(remote.destroy_calls == 1 for remote in transport.remotes)
|
|
assert "sentinel" not in output.read_text(encoding="utf-8")
|
|
|
|
|
|
def test_state_reuse_preserves_remote_files(transport, tmp_path):
|
|
output = tmp_path / "state.jsonl"
|
|
assert bench.main(["--provider", "opensandbox", "--workload", "state_reuse", "--iterations", "2", "--idle-timeout", "0", "--output", str(output)]) == 0
|
|
assert transport.remotes[-1].state == "benchmark-state-42"
|
|
|
|
|
|
def test_replica_pressure_keeps_concurrent_scopes_separate(transport, tmp_path):
|
|
output = tmp_path / "pressure.jsonl"
|
|
assert (
|
|
bench.main(
|
|
[
|
|
"--provider",
|
|
"opensandbox",
|
|
"--scenario",
|
|
"replica_pressure",
|
|
"--iterations",
|
|
"4",
|
|
"--concurrency",
|
|
"2",
|
|
"--users",
|
|
"2",
|
|
"--replicas",
|
|
"1",
|
|
"--idle-timeout",
|
|
"0",
|
|
"--output",
|
|
str(output),
|
|
]
|
|
)
|
|
== 0
|
|
)
|
|
rows = [json.loads(line) for line in output.read_text(encoding="utf-8").splitlines()]
|
|
assert all(row["active_at_acquire"] == 2 and row["success"] for row in rows)
|
|
assert len({row["sandbox_id"] for row in rows}) == 2
|
|
assert all(remote.destroy_calls == 1 for remote in transport.remotes)
|
|
|
|
|
|
def test_failed_command_still_releases_and_destroys_remote(transport):
|
|
provider, _ = bench._make_opensandbox_provider({"idle_timeout": 0})
|
|
sid = provider.acquire("thread", user_id="owner")
|
|
transport.remotes[0].command_error = True
|
|
try:
|
|
row = bench._run_one_turn(provider, "opensandbox", "warm_same_thread", "noop", "true", 0, 1, "owner", "thread", True)
|
|
assert not row.success
|
|
assert row.sandbox_id == sid
|
|
assert transport.remotes[0].destroy_calls == 1
|
|
assert not provider._warm_pool and not provider._sandboxes
|
|
finally:
|
|
provider.shutdown()
|
|
|
|
|
|
def test_failed_destroy_invalidates_measurement_and_fails_shutdown(transport):
|
|
provider, _ = bench._make_opensandbox_provider({"idle_timeout": 0})
|
|
provider.acquire("thread", user_id="owner")
|
|
transport.remotes[0].destroy_error = True
|
|
try:
|
|
row = bench._run_one_turn(provider, "opensandbox", "warm_same_thread", "noop", "true", 0, 1, "owner", "thread", True)
|
|
assert not row.success
|
|
assert "offline-remote-1" in row.error
|
|
assert "sentinel-private-sdk-error" not in row.error
|
|
finally:
|
|
with pytest.raises(RuntimeError, match="cleanup"):
|
|
provider.shutdown()
|
|
# atexit must not repeat the error or pretend that a closed SDK client retried it.
|
|
provider.shutdown()
|
|
assert transport.remotes[0].destroy_calls == 1
|
|
|
|
|
|
def test_shutdown_attempts_every_remote_before_reporting_failure(transport):
|
|
provider, _ = bench._make_opensandbox_provider({"idle_timeout": 0})
|
|
provider.acquire("first", user_id="owner")
|
|
provider.acquire("second", user_id="owner")
|
|
transport.remotes[0].destroy_error = True
|
|
with pytest.raises(RuntimeError, match="cleanup"):
|
|
provider.shutdown()
|
|
assert [remote.destroy_calls for remote in transport.remotes] == [1, 1]
|
|
|
|
|
|
def test_shutdown_failure_is_also_visible_in_jsonl(transport, monkeypatch, tmp_path):
|
|
original_factory = bench.PROVIDER_FACTORIES["opensandbox"]
|
|
|
|
def factory(config):
|
|
provider, snapshot = original_factory(config)
|
|
original_create = provider._create_sandbox
|
|
|
|
def create(*args, **kwargs):
|
|
sandbox = original_create(*args, **kwargs)
|
|
transport.remotes[-1].destroy_error = True
|
|
return sandbox
|
|
|
|
provider._create_sandbox = create
|
|
return provider, snapshot
|
|
|
|
monkeypatch.setitem(bench.PROVIDER_FACTORIES, "opensandbox", factory)
|
|
output = tmp_path / "cleanup.jsonl"
|
|
with pytest.raises(RuntimeError, match="cleanup"):
|
|
bench.main(["--provider", "opensandbox", "--iterations", "1", "--warmup-iterations", "0", "--idle-timeout", "0", "--output", str(output)])
|
|
rows = [json.loads(line) for line in output.read_text(encoding="utf-8").splitlines()]
|
|
assert rows[0]["success"]
|
|
assert rows[-1]["scenario"] == "shutdown"
|
|
assert rows[-1]["success"] is False
|
|
assert "sentinel-private-sdk-error" not in output.read_text(encoding="utf-8")
|
|
assert summarize.main([str(output), "--json"]) == 1
|
|
|
|
|
|
def test_image_override_and_failed_construction_restore_config(transport):
|
|
provider, snapshot = bench._make_opensandbox_provider({"image": "override-image", "idle_timeout": 0})
|
|
try:
|
|
assert snapshot["image"] == "override-image"
|
|
assert get_app_config() is transport.config
|
|
assert transport.config.sandbox.image == "test-image@sha256:fixture"
|
|
finally:
|
|
provider.shutdown()
|
|
bad = transport.config.model_copy(update={"sandbox": transport.config.sandbox.model_copy(update={"request_timeout": -1})})
|
|
push_current_app_config(bad)
|
|
try:
|
|
with pytest.raises(ValueError, match="request_timeout"):
|
|
bench._make_opensandbox_provider({})
|
|
assert get_app_config() is bad
|
|
finally:
|
|
pop_current_app_config()
|
|
|
|
|
|
def test_idle_reaping_forces_a_new_remote(transport, monkeypatch, tmp_path):
|
|
clock = [100.0]
|
|
# Warm-pool idle age is written and read on the monotonic clock, so freeze
|
|
# that one and let the benchmark's sleep advance it. Freezing `time.time`
|
|
# instead leaves both ends of the comparison on the real clock: the entry
|
|
# never expires, the reaper removes nothing, and the next turn is a warm hit.
|
|
monkeypatch.setattr(time, "monotonic", lambda: clock[0])
|
|
monkeypatch.setattr(bench.time, "sleep", lambda seconds: clock.__setitem__(0, clock[0] + seconds))
|
|
output = tmp_path / "idle.jsonl"
|
|
assert (
|
|
bench.main(
|
|
[
|
|
"--provider",
|
|
"opensandbox",
|
|
"--scenario",
|
|
"idle_timeout",
|
|
"--iterations",
|
|
"1",
|
|
"--warmup-iterations",
|
|
"0",
|
|
"--idle-timeout",
|
|
"1",
|
|
"--output",
|
|
str(output),
|
|
]
|
|
)
|
|
== 0
|
|
)
|
|
rows = [json.loads(line) for line in output.read_text(encoding="utf-8").splitlines()]
|
|
assert [row["warm_hit"] for row in rows] == [False, False]
|
|
assert all(row["success"] for row in rows)
|
|
assert len(transport.remotes) == 2
|
|
assert all(remote.destroy_calls == 1 for remote in transport.remotes)
|
|
|
|
|
|
@pytest.mark.parametrize("extra", [["--fault-inject", "0"], ["--health-check-skip-seconds", "1"]])
|
|
def test_unsupported_options_fail_before_creating_resources(transport, extra):
|
|
with pytest.raises(SystemExit, match="opensandbox"):
|
|
bench.main(["--provider", "opensandbox", *extra])
|
|
assert not transport.remotes
|