github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-07 19:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sandbox): serialize registry mutations and lock usage

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-18 04:55:33 +01:00
parent 28bac46c92
commit 35016a380c
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/agents/sandbox/registry.test.ts
View File

@@ -1,12 +1,18 @@
import { mkdtempSync } from "node:fs";
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import { tmpdir } from "node:os";
import path from "node:path";
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
const TEST_STATE_DIR = mkdtempSync(path.join(tmpdir(), "openclaw-sandbox-registry-")); const { TEST_STATE_DIR, SANDBOX_REGISTRY_PATH, SANDBOX_BROWSER_REGISTRY_PATH } = vi.hoisted(() => {
const SANDBOX_REGISTRY_PATH = path.join(TEST_STATE_DIR, "containers.json"); const path = require("node:path");
const SANDBOX_BROWSER_REGISTRY_PATH = path.join(TEST_STATE_DIR, "browsers.json"); const { mkdtempSync } = require("node:fs");
const { tmpdir } = require("node:os");
const baseDir = mkdtempSync(path.join(tmpdir(), "openclaw-sandbox-registry-"));
return {
TEST_STATE_DIR: baseDir,
SANDBOX_REGISTRY_PATH: path.join(baseDir, "containers.json"),
SANDBOX_BROWSER_REGISTRY_PATH: path.join(baseDir, "browsers.json"),
};
});
vi.mock("./constants.js", () => ({ vi.mock("./constants.js", () => ({
SANDBOX_STATE_DIR: TEST_STATE_DIR, SANDBOX_STATE_DIR: TEST_STATE_DIR,
@@ -183,8 +189,8 @@ describe("registry race safety", () => {
}; };
await Promise.all([ await Promise.all([
removeRegistryEntry("container-x"),
updateRegistry(containerEntry({ containerName: "container-x", configHash: "updated" })), updateRegistry(containerEntry({ containerName: "container-x", configHash: "updated" })),
removeRegistryEntry("container-x"),
]); ]);
const registry = await readRegistry(); const registry = await readRegistry();
@@ -224,8 +230,8 @@ describe("registry race safety", () => {
}; };
await Promise.all([ await Promise.all([
removeBrowserRegistryEntry("browser-x"),
updateBrowserRegistry(browserEntry({ containerName: "browser-x", configHash: "updated" })), updateBrowserRegistry(browserEntry({ containerName: "browser-x", configHash: "updated" })),
removeBrowserRegistryEntry("browser-x"),
]); ]);
const registry = await readBrowserRegistry(); const registry = await readBrowserRegistry();

2
src/agents/sandbox/registry.ts
View File

@@ -70,7 +70,7 @@ function isRegistryFile<T extends RegistryEntry>(value: unknown): value is Regis
} }
async function withRegistryLock<T>(registryPath: string, fn: () => Promise<T>): Promise<T> { async function withRegistryLock<T>(registryPath: string, fn: () => Promise<T>): Promise<T> {
const lock = await acquireSessionWriteLock({ sessionFile: registryPath }); const lock = await acquireSessionWriteLock({ sessionFile: registryPath, allowReentrant: false });
try { try {
return await fn(); return await fn();
} finally { } finally {

4
src/agents/session-write-lock.ts
View File

@@ -375,6 +375,7 @@ export async function acquireSessionWriteLock(params: {
timeoutMs?: number; timeoutMs?: number;
staleMs?: number; staleMs?: number;
maxHoldMs?: number; maxHoldMs?: number;
allowReentrant?: boolean;
}): Promise<{ }): Promise<{
release: () => Promise<void>; release: () => Promise<void>;
}> { }> {
@@ -394,8 +395,9 @@ export async function acquireSessionWriteLock(params: {
const normalizedSessionFile = path.join(normalizedDir, path.basename(sessionFile)); const normalizedSessionFile = path.join(normalizedDir, path.basename(sessionFile));
const lockPath = `${normalizedSessionFile}.lock`; const lockPath = `${normalizedSessionFile}.lock`;
const allowReentrant = params.allowReentrant ?? true;
const held = HELD_LOCKS.get(normalizedSessionFile); const held = HELD_LOCKS.get(normalizedSessionFile);
if (held) { if (allowReentrant && held) {
held.count += 1; held.count += 1;
return { return {
release: async () => { release: async () => {