原子写和部署脚本的几处(复核 R-a11、R-a12、R-a13 追加写)

- R-a12 create_bytes:硬链接不了的文件系统(exFAT、一部分 SMB / FUSE,EPERM / ENOTSUP / EXDEV)不再首次启动就崩,退回 O_CREAT | O_EXCL 直接建(仍然只建一次,说明里写了写的那一会儿读的一方可能读到不完整);建成后 fsync 目录(同 raw_store)
- R-a13 file_write 的追加改回原地追加写(O_APPEND,core/atomic.append_bytes):不换文件(inode、权限、开着的句柄不变),原有内容不动,文件大了也不用整份读出来重写;取舍写在函数说明里——读的一方最多看到半截新内容。覆盖照旧先写临时文件再改名,并沿用原文件的权限
- R-a11 deploy.sh 改属主前认数据目录收紧:只认 agentlab.db、.secret_key、.agentlab-data 三样之一(不再认 uploads/ 这种普通目录名);.agentlab-data 是服务启动时(Settings.ensure_dirs)建的标记,只建一次不覆盖,库在 PostgreSQL、密钥由环境变量给的部署也认得出;老部署有 agentlab.db 或 .secret_key。deploy/README 写明这个文件别删
- 测试:模拟不能硬链接仍只建一次、权限 0600、不留临时文件;覆盖沿用原权限;追加不换 inode、权限不变;file_write 追加不换文件、覆盖照常;数据目录里有标记、重复启动不覆盖
This commit is contained in:
ThearchyHelios
2026-10-19 12:07:31 +08:00
parent ba87a93ef7
commit db328efd21
6 changed files with 142 additions and 14 deletions
+53 -2
View File
@@ -77,16 +77,67 @@ def test_content_addressed_artifacts_are_written_atomically(tmp_path, monkeypatc
assert _leftovers(folder) == []
async def test_file_write_tool_appends_by_replacing_the_whole_file():
async def test_file_write_tool_overwrites_atomically_and_appends_in_place():
from types import SimpleNamespace
from app.tools.builtin.files import file_write
ctx = SimpleNamespace(sandbox_session=f"atomic-{os.getpid()}")
assert (await file_write(ctx, path="notes/a.txt", content="第一行\n"))["ok"]
out = await file_write(ctx, path="notes/a.txt", content="第二行\n", append=True)
from app.core.config import settings
path = settings.session_dir(ctx.sandbox_session) / "notes" / "a.txt"
inode = path.stat().st_ino
out = await file_write(ctx, path="notes/a.txt", content="第二行\n", append=True)
assert path.read_text(encoding="utf-8") == "第一行\n第二行\n" and out["bytes"] == len("第一行\n第二行\n".encode())
assert path.stat().st_ino == inode, "追加不换文件"
await file_write(ctx, path="notes/a.txt", content="重写\n")
assert path.read_text(encoding="utf-8") == "重写\n"
assert _leftovers(path.parent) == []
def test_create_falls_back_when_the_filesystem_cannot_hard_link(tmp_path, monkeypatch):
"""exFAT、一部分 SMB / FUSE 挂载不支持硬链接(EPERM、ENOTSUP、EXDEV):退回 O_EXCL 直接建,照样只建一次,不崩。"""
import errno
def no_links(src, dst):
raise OSError(errno.EPERM, "Operation not permitted")
monkeypatch.setattr(os, "link", no_links)
target = tmp_path / ".secret"
assert atomic.create_text(target, "第一把", mode=0o600) is True
assert atomic.create_text(target, "第二把", mode=0o600) is False
assert target.read_text() == "第一把" and stat.S_IMODE(target.stat().st_mode) == 0o600
assert _leftovers(tmp_path) == []
def test_replacing_keeps_the_permissions_of_the_old_file(tmp_path):
target = tmp_path / "run.sh"
target.write_text("echo 1")
target.chmod(0o750)
atomic.write_text(target, "echo 2")
assert target.read_text() == "echo 2" and stat.S_IMODE(target.stat().st_mode) == 0o750
def test_appending_keeps_the_same_file(tmp_path):
"""追加写不换文件:inode、权限都不变,原有内容不动(以前整份读出来重写、再改名)。"""
target = tmp_path / "log.txt"
target.write_text("一\n")
target.chmod(0o640)
before = target.stat().st_ino
atomic.append_bytes(target, "二\n".encode())
assert target.read_text() == "一\n二\n"
assert target.stat().st_ino == before and stat.S_IMODE(target.stat().st_mode) == 0o640
assert _leftovers(tmp_path) == []
def test_the_data_dir_carries_a_marker_deploy_can_recognise():
"""数据目录里有 .agentlab-data:库在 PostgreSQL、密钥由环境变量给时,deploy.sh 也认得出这是 AgentLab 的数据目录。"""
from app.core.config import DATA_DIR_MARKER, settings
settings.ensure_dirs()
marker = settings.data_dir / DATA_DIR_MARKER
assert marker.is_file()
text = marker.read_text(encoding="utf-8")
settings.ensure_dirs()
assert marker.read_text(encoding="utf-8") == text, "已有的不覆盖"