From 4e1a385fd933ac9ad1ea8cd58cb1f50762ee375b Mon Sep 17 00:00:00 2001 From: DongHyeonka Date: Sat, 14 Nov 2026 06:04:30 +0900 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=8B=9C=ED=97=98=20=EC=82=AC=EC=A0=84=20=EC=A0=90=EA=B2=80?= =?UTF-8?q?=EC=9D=B4=20user=20manager=EC=9D=98=20cgroup=20=EC=A0=9C?= =?UTF-8?q?=EC=96=B4=EA=B8=B0=EB=A5=BC=20=EB=B3=B8=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 문제: provider scope는 systemd user manager에게서 cpu·memory·pids 제어기를 받아야 한도를 건다. 사전 점검은 root cgroup에 쓸 수 있는 제어기가 있는지만 봐서, user manager가 아무 제어기도 받지 못한 컨테이너(2026-11-14, desktop 4회 중 1회)에서도 PASS를 냈다. 그 뒤 provider 시험 18개가 하나씩 `cannot read memory.max`로 떨어졌다. 고른 방법: 이 프로세스의 uid(/proc/self/status)로 user manager의 cgroup(user.slice/user-.slice/user@.service)을 찾고, 그 cgroup.controllers에 cpu·memory·pids가 다 있는지 본다. 빠지면 빠진 이름과 있는 목록을 댄다. cgroup v2 확인이 실패한 호스트에서는 이 경로가 뜻이 없어 건너뛴다. 호스트를 읽는 부분은 기존처럼 SystemTestHost를 거친다. 버린 대안: systemd-run --user --scope로 실제 scope를 띄워 memory.max를 읽기는 본 단계와 더 같지만, 사전 점검이 unit을 만들고 정리해야 한다. 제어기 목록은 scope가 받을 수 있는 것과 같은 값이라 읽기로 충분하다. 위험·한계: systemd의 표준 user manager cgroup 경로를 가정한다. 그 경로에 manager가 없으면 사전 점검이 실패한다(provider는 systemd-run --user를 쓰므로 그때도 돌 수 없다). 검증: 노트북 감싸개에서 새 시험이 옛 점검으로 4개 실패(RED), 고친 뒤 system-test-prerequisites 13/13 통과. 노트북에서 실제 점검 PASS. --- scripts/check-system-test-prerequisites.ts | 36 ++++++++++++++ tests/unit/system-test-prerequisites.test.ts | 49 +++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/scripts/check-system-test-prerequisites.ts b/scripts/check-system-test-prerequisites.ts index f3aa5ec9..9a355026 100644 --- a/scripts/check-system-test-prerequisites.ts +++ b/scripts/check-system-test-prerequisites.ts @@ -71,10 +71,13 @@ export async function findSystemTestPrerequisiteFailures( } } + let cgroupV2 = false; try { const controllers = await host.readFile("/sys/fs/cgroup/cgroup.controllers"); if (controllers.trim().length === 0) { failures.push("cgroup v2 controllers are unavailable"); + } else { + cgroupV2 = true; } } catch { failures.push("cgroup v2 is required at /sys/fs/cgroup/cgroup.controllers"); @@ -87,6 +90,10 @@ export async function findSystemTestPrerequisiteFailures( } } + // The user manager's cgroup path below is a cgroup v2 path; without v2 it would name the wrong cause. + const controllerFailure = cgroupV2 ? await findProviderScopeControllerFailure(host) : undefined; + if (controllerFailure !== undefined) failures.push(controllerFailure); + if (executable.get(BWRAP)) { const failure = await findProviderSandboxNamespaceFailure(host); if (failure !== undefined) failures.push(failure); @@ -141,6 +148,35 @@ async function namespaceFailure( ].join("\n"); } +/** The controllers every provider scope is limited by (scripts/lib/provider-cgroup.ts). */ +const PROVIDER_SCOPE_CONTROLLERS = Object.freeze(["cpu", "memory", "pids"] as const); + +/** + * Whether the systemd user manager that provider scopes run under was handed + * the cgroup controllers their limits need. A manager without them passed + * every check above, and then each provider stopped with `provider cgroup + * enforcement failed: cannot read memory.max` (2026-11-14: a `docker exec` + * sat in the system container's root cgroup while systemd started, so systemd + * delegated nothing). + */ +async function findProviderScopeControllerFailure(host: SystemTestHost): Promise { + const status = await host.readFile("/proc/self/status").catch(() => ""); + const uid = /^Uid:\s+(\d+)\s/mu.exec(status)?.[1]; + if (uid === undefined) return "this process's uid is unreadable at /proc/self/status"; + const manager = `/sys/fs/cgroup/user.slice/user-${uid}.slice/user@${uid}.service`; + let delegated: string[]; + try { + delegated = (await host.readFile(`${manager}/cgroup.controllers`)).trim().split(/\s+/u); + } catch { + return `a systemd user manager is required at ${manager}`; + } + const missing = PROVIDER_SCOPE_CONTROLLERS.filter((controller) => !delegated.includes(controller)); + return missing.length === 0 + ? undefined + : `the systemd user manager at ${manager} has no ${missing.join(", ")} cgroup controller ` + + `for provider scopes (it has: ${delegated.join(" ") || "none"})`; +} + export function formatSystemTestPrerequisiteReport(failures: readonly string[]): string { return [ "System/CI-runner test prerequisites are unavailable:", diff --git a/tests/unit/system-test-prerequisites.test.ts b/tests/unit/system-test-prerequisites.test.ts index 8821bc42..832a9b51 100644 --- a/tests/unit/system-test-prerequisites.test.ts +++ b/tests/unit/system-test-prerequisites.test.ts @@ -15,6 +15,7 @@ type SpawnCall = Readonly<{ command: string; args: readonly string[] }>; type SpawnResult = ReturnType; const RTM_NEWADDR = "bwrap: loopback: Failed RTM_NEWADDR: Operation not permitted"; +const USER_MANAGER_CONTROLLERS = "/sys/fs/cgroup/user.slice/user-1000.slice/user@1000.service/cgroup.controllers"; /** A host that has every prerequisite, except what `bwrap` and `files` say. */ function fakeHost( @@ -25,8 +26,12 @@ function fakeHost( const host: SystemTestHost = { access: async () => undefined, readFile: async (target) => { - if (target === "/sys/fs/cgroup/cgroup.controllers") return "cpuset cpu io memory pids\n"; - const content = files[target]; + const content = { + "/sys/fs/cgroup/cgroup.controllers": "cpuset cpu io memory pids\n", + "/proc/self/status": "Name:\tnode\nUid:\t1000\t1000\t1000\t1000\n", + [USER_MANAGER_CONTROLLERS]: "cpu memory pids\n", + ...files, + }[target]; if (content === undefined) throw new Error(`ENOENT: ${target}`); return content; }, @@ -125,6 +130,46 @@ describe("system test prerequisites (1105/12-01)", () => { }); }); +// 2026-11-14. In one system container in four, systemd delegated no cgroup +// controller to the root user manager; this check printed PASS and then every +// provider stopped with `provider cgroup enforcement failed: cannot read +// memory.max`. +describe("system test prerequisites: provider scope controllers", () => { + it.each([ + ["none", "\n", "cpu, memory, pids", "none"], + ["memory", "cpu pids\n", "memory", "cpu pids"], + ])("names the controllers the user manager lacks (%s missing)", async (_label, delegated, missing, has) => { + const { host } = fakeHost({ status: 0, stderr: "" }, { [USER_MANAGER_CONTROLLERS]: delegated }); + + expect(await findSystemTestPrerequisiteFailures(host)).toEqual([ + "the systemd user manager at /sys/fs/cgroup/user.slice/user-1000.slice/user@1000.service " + + `has no ${missing} cgroup controller for provider scopes (it has: ${has})`, + ]); + }); + + it("reads the user manager only where cgroup v2 is there", async () => { + const { host } = fakeHost({ status: 0, stderr: "" }, { "/sys/fs/cgroup/cgroup.controllers": "\n", [USER_MANAGER_CONTROLLERS]: "\n" }); + + expect(await findSystemTestPrerequisiteFailures(host)).toEqual(["cgroup v2 controllers are unavailable"]); + }); + + it("names an unreadable uid", async () => { + const { host } = fakeHost({ status: 0, stderr: "" }, { "/proc/self/status": "Name:\tnode\n" }); + + expect(await findSystemTestPrerequisiteFailures(host)).toEqual([ + "this process's uid is unreadable at /proc/self/status", + ]); + }); + + it("requires a user manager for this process's own uid", async () => { + const { host } = fakeHost({ status: 0, stderr: "" }, { "/proc/self/status": "Uid:\t0\t0\t0\t0\n" }); + + expect(await findSystemTestPrerequisiteFailures(host)).toEqual([ + "a systemd user manager is required at /sys/fs/cgroup/user.slice/user-0.slice/user@0.service", + ]); + }); +}); + // 1101/13-03. The release provider jobs run the same sandbox on whatever // runner picks them up. The supervisor checked only that the executables // exist, so a host that refuses the namespaces failed later with bwrap's raw