@zukhruf/testing 0.8.17 → 0.8.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +47 -37
- package/dist/databases/collector.d.ts +23 -20
- package/dist/databases/collector.d.ts.map +1 -1
- package/dist/databases/collector.js +9 -6
- package/dist/databases/collector.js.map +1 -1
- package/dist/databases/mysql-family-collector.d.ts +1 -6
- package/dist/databases/mysql-family-collector.d.ts.map +1 -1
- package/dist/databases/mysql-family-collector.js +12 -20
- package/dist/databases/mysql-family-collector.js.map +1 -1
- package/dist/databases/mysql-family-server.d.ts.map +1 -1
- package/dist/databases/mysql-family-server.js +2 -6
- package/dist/databases/mysql-family-server.js.map +1 -1
- package/dist/databases/postgres-collector.d.ts +1 -6
- package/dist/databases/postgres-collector.d.ts.map +1 -1
- package/dist/databases/postgres-collector.js +13 -20
- package/dist/databases/postgres-collector.js.map +1 -1
- package/dist/databases/postgres.d.ts.map +1 -1
- package/dist/databases/postgres.js +2 -3
- package/dist/databases/postgres.js.map +1 -1
- package/dist/databases/sqlserver-collector.d.ts +2 -5
- package/dist/databases/sqlserver-collector.d.ts.map +1 -1
- package/dist/databases/sqlserver-collector.js +20 -37
- package/dist/databases/sqlserver-collector.js.map +1 -1
- package/dist/databases/sqlserver.d.ts +5 -2
- package/dist/databases/sqlserver.d.ts.map +1 -1
- package/dist/databases/sqlserver.js +11 -18
- package/dist/databases/sqlserver.js.map +1 -1
- package/dist/docker/reaper.d.ts +96 -0
- package/dist/docker/reaper.d.ts.map +1 -0
- package/dist/docker/reaper.js +557 -0
- package/dist/docker/reaper.js.map +1 -0
- package/dist/docker/run-records.d.ts +3 -10
- package/dist/docker/run-records.d.ts.map +1 -1
- package/dist/docker/run-records.js +3 -14
- package/dist/docker/run-records.js.map +1 -1
- package/dist/docker/testbed.d.ts +6 -7
- package/dist/docker/testbed.d.ts.map +1 -1
- package/dist/docker/testbed.js +52 -20
- package/dist/docker/testbed.js.map +1 -1
- package/dist/scripts/docker-global-setup.d.ts +6 -1
- package/dist/scripts/docker-global-setup.d.ts.map +1 -1
- package/dist/scripts/docker-global-setup.js +42 -97
- package/dist/scripts/docker-global-setup.js.map +1 -1
- package/dist/scripts/run-cleanup.d.ts +5 -13
- package/dist/scripts/run-cleanup.d.ts.map +1 -1
- package/dist/scripts/run-cleanup.js +24 -259
- package/dist/scripts/run-cleanup.js.map +1 -1
- package/package.json +3 -3
- package/dist/scripts/docker-cleanup-worker.d.ts +0 -21
- package/dist/scripts/docker-cleanup-worker.d.ts.map +0 -1
- package/dist/scripts/docker-cleanup-worker.js +0 -31
- package/dist/scripts/docker-cleanup-worker.js.map +0 -1
package/dist/docker/testbed.d.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { Docker, type EngineApi, type Environment, type ExecResult, type OwnedContainer, type OwnedVolume } from '@zukhruf/docker';
|
|
2
2
|
import { DockerDirectory } from './directory.ts';
|
|
3
3
|
import { ServiceContainer } from './service-container.ts';
|
|
4
|
-
/** Marks a server that `reuse()` shares across processes and runs. Its value is the fingerprint of the server's request (ADR 0019). */
|
|
5
|
-
export declare const SERVER_LABEL = "dev.zukhruf.testing.server";
|
|
6
4
|
export interface ServiceOptions {
|
|
7
5
|
/** The container's port that answers on 127.0.0.1 of this machine. */
|
|
8
6
|
internalPort: number;
|
|
@@ -26,21 +24,22 @@ export declare class DockerTestbed {
|
|
|
26
24
|
constructor({ environment }: DockerTestbedOptions);
|
|
27
25
|
/**
|
|
28
26
|
* Defaults for disposable test containers, including external launchers.
|
|
29
|
-
*
|
|
30
|
-
* the
|
|
27
|
+
* In a run, this process holds the run's reaper on the testbed's engine
|
|
28
|
+
* before the labels exist, as a create does (ADR 0020, item 11). A
|
|
29
|
+
* launcher that creates with these labels thus leaves nothing behind.
|
|
31
30
|
*/
|
|
32
|
-
|
|
31
|
+
defaults(): Promise<{
|
|
33
32
|
Labels: Record<string, string>;
|
|
34
33
|
HostConfig: {
|
|
35
34
|
Memory: number;
|
|
36
35
|
NanoCpus: number;
|
|
37
36
|
};
|
|
38
|
-
}
|
|
37
|
+
}>;
|
|
39
38
|
/** The client of the engine that this instance's handles are on. */
|
|
40
39
|
client(): Promise<Docker>;
|
|
41
40
|
/** A fixture directory on the engine's host. */
|
|
42
41
|
directory(): Promise<DockerDirectory>;
|
|
43
|
-
/** Creates a named volume.
|
|
42
|
+
/** Creates a named volume. The reaper of its run removes it if this process dies first. */
|
|
44
43
|
volume(): Promise<OwnedVolume>;
|
|
45
44
|
/** Starts a container this process owns. It stays after it stops, until disposal removes it. */
|
|
46
45
|
start(body: EngineApi.ContainerCreateRequest, options?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testbed.d.ts","sourceRoot":"","sources":["../../src/docker/testbed.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,MAAM,EACN,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,UAAU,EAEf,KAAK,cAAc,EACnB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"testbed.d.ts","sourceRoot":"","sources":["../../src/docker/testbed.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,MAAM,EACN,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,UAAU,EAEf,KAAK,cAAc,EACnB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAUjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,MAAM,WAAW,cAAc;IAC7B,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,sGAAsG;IACtG,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+EAA+E;IAC/E,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,iGAAiG;IACjG,WAAW,EAAE,WAAW,CAAC;CAC1B;AAsDD;;;;;GAKG;AACH,qBAAa,aAAa;;gBAuBZ,EAAE,WAAW,EAAE,EAAE,oBAAoB;IAKjD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/B,UAAU,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;KAClD,CAAC;IAKF,oEAAoE;IAC9D,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,gDAAgD;IAC1C,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;IAI3C,2FAA2F;IACrF,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC;IAUpC,gGAAgG;IAC1F,KAAK,CACT,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1B,OAAO,CAAC,cAAc,CAAC;IAS1B;;;OAGG;IACG,KAAK,CACT,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAuB5B;;;;;;OAMG;IACG,KAAK,CACT,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,gBAAgB,CAAC;IAsC5B,8GAA8G;IACxG,GAAG,CACP,IAAI,EAAE,SAAS,CAAC,sBAAsB,EACtC,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1B,OAAO,CAAC,UAAU,CAAC;CAkJvB"}
|
package/dist/docker/testbed.js
CHANGED
|
@@ -4,10 +4,9 @@ import { ConnectionFailedError, Docker, ImageNotFoundError, } from '@zukhruf/doc
|
|
|
4
4
|
import { DockerDirectory } from "./directory.js";
|
|
5
5
|
import { EngineLease, LEASED_SERVER_LABEL, LEASE_LABEL, sweepLeaseName, } from "./engine-lease.js";
|
|
6
6
|
import { DockerHost } from "./host.js";
|
|
7
|
+
import { REAPER_DEFAULTS, ReaperHold, SERVER_LABEL } from "./reaper.js";
|
|
7
8
|
import { TEST_RUN_LABEL, readRun } from "./run-records.js";
|
|
8
9
|
import { ServiceContainer } from "./service-container.js";
|
|
9
|
-
/** Marks a server that `reuse()` shares across processes and runs. Its value is the fingerprint of the server's request (ADR 0019). */
|
|
10
|
-
export const SERVER_LABEL = 'dev.zukhruf.testing.server';
|
|
11
10
|
/** The default resources: they protect a shared engine, such as an SSH engine that runs real applications. */
|
|
12
11
|
const RESOURCES = { Memory: 1024 ** 3, NanoCpus: 1e9 };
|
|
13
12
|
/**
|
|
@@ -17,6 +16,13 @@ const RESOURCES = { Memory: 1024 ** 3, NanoCpus: 1e9 };
|
|
|
17
16
|
* the next reuse() of that server.
|
|
18
17
|
*/
|
|
19
18
|
const processLeases = new Map();
|
|
19
|
+
/**
|
|
20
|
+
* The hold of this process on the reaper of its run, by the engine's host
|
|
21
|
+
* (ADR 0020). A hold that ends while this process lives takes itself again at
|
|
22
|
+
* once, and each create waits for it. A first hold that failed is taken again
|
|
23
|
+
* by the next create.
|
|
24
|
+
*/
|
|
25
|
+
const reapers = new Map();
|
|
20
26
|
const byKey = ([a], [b]) => {
|
|
21
27
|
if (a < b)
|
|
22
28
|
return -1;
|
|
@@ -71,15 +77,14 @@ export class DockerTestbed {
|
|
|
71
77
|
}
|
|
72
78
|
/**
|
|
73
79
|
* Defaults for disposable test containers, including external launchers.
|
|
74
|
-
*
|
|
75
|
-
* the
|
|
80
|
+
* In a run, this process holds the run's reaper on the testbed's engine
|
|
81
|
+
* before the labels exist, as a create does (ADR 0020, item 11). A
|
|
82
|
+
* launcher that creates with these labels thus leaves nothing behind.
|
|
76
83
|
*/
|
|
77
|
-
|
|
78
|
-
this.#run
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
HostConfig: { ...RESOURCES },
|
|
82
|
-
};
|
|
84
|
+
async defaults() {
|
|
85
|
+
if (this.#run !== undefined)
|
|
86
|
+
await this.#reaper(await this.#engine());
|
|
87
|
+
return this.#defaults();
|
|
83
88
|
}
|
|
84
89
|
/** The client of the engine that this instance's handles are on. */
|
|
85
90
|
async client() {
|
|
@@ -89,13 +94,13 @@ export class DockerTestbed {
|
|
|
89
94
|
async directory() {
|
|
90
95
|
return DockerDirectory.create((await this.#engine()).host, this.#run);
|
|
91
96
|
}
|
|
92
|
-
/** Creates a named volume.
|
|
97
|
+
/** Creates a named volume. The reaper of its run removes it if this process dies first. */
|
|
93
98
|
async volume() {
|
|
94
|
-
const
|
|
95
|
-
return client.volumes.create({
|
|
99
|
+
const engine = await this.#engine();
|
|
100
|
+
return this.#creating(engine, () => engine.client.volumes.create({
|
|
96
101
|
Name: `zukhruf-testing-${randomUUID()}`,
|
|
97
|
-
Labels: this
|
|
98
|
-
});
|
|
102
|
+
Labels: this.#defaults().Labels,
|
|
103
|
+
}));
|
|
99
104
|
}
|
|
100
105
|
/** Starts a container this process owns. It stays after it stops, until disposal removes it. */
|
|
101
106
|
async start(body, options) {
|
|
@@ -174,7 +179,7 @@ export class DockerTestbed {
|
|
|
174
179
|
return taken;
|
|
175
180
|
const taking = this.#creating(engine, async () => {
|
|
176
181
|
const lease = await EngineLease.take(engine.client, {
|
|
177
|
-
...this
|
|
182
|
+
...this.#defaults().Labels,
|
|
178
183
|
[LEASE_LABEL]: 'process',
|
|
179
184
|
[LEASED_SERVER_LABEL]: fingerprint,
|
|
180
185
|
});
|
|
@@ -191,11 +196,11 @@ export class DockerTestbed {
|
|
|
191
196
|
return taking;
|
|
192
197
|
}
|
|
193
198
|
/**
|
|
194
|
-
* Runs `create`
|
|
195
|
-
* a second try, as `docker run` does.
|
|
199
|
+
* Runs `create` after this process holds the reaper of its run, and pulls
|
|
200
|
+
* a missing image before a second try, as `docker run` does.
|
|
196
201
|
*/
|
|
197
202
|
async #creating(engine, create) {
|
|
198
|
-
await
|
|
203
|
+
await this.#reaper(engine);
|
|
199
204
|
try {
|
|
200
205
|
return await create();
|
|
201
206
|
}
|
|
@@ -206,6 +211,25 @@ export class DockerTestbed {
|
|
|
206
211
|
return await create();
|
|
207
212
|
}
|
|
208
213
|
}
|
|
214
|
+
/** Holds the reaper of this process's run on the engine, before this process creates anything there. */
|
|
215
|
+
async #reaper(engine) {
|
|
216
|
+
const run = this.#run;
|
|
217
|
+
if (run === undefined)
|
|
218
|
+
return;
|
|
219
|
+
const key = `${engine.client.host} ${run.id}`;
|
|
220
|
+
const taken = reapers.get(key);
|
|
221
|
+
if (taken !== undefined) {
|
|
222
|
+
await (await taken).held();
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
const taking = ReaperHold.take(engine.client, run.id, REAPER_DEFAULTS, globalThis);
|
|
226
|
+
reapers.set(key, taking);
|
|
227
|
+
taking.catch(() => {
|
|
228
|
+
if (reapers.get(key) === taking)
|
|
229
|
+
reapers.delete(key);
|
|
230
|
+
});
|
|
231
|
+
await taking;
|
|
232
|
+
}
|
|
209
233
|
async #startOrRemove(container) {
|
|
210
234
|
try {
|
|
211
235
|
await container.start();
|
|
@@ -230,9 +254,17 @@ export class DockerTestbed {
|
|
|
230
254
|
throw error;
|
|
231
255
|
}
|
|
232
256
|
}
|
|
257
|
+
/** The run's labels and the default resources. The read records this process in the run. */
|
|
258
|
+
#defaults() {
|
|
259
|
+
this.#run?.records.recordThisProcess();
|
|
260
|
+
return {
|
|
261
|
+
Labels: this.#run ? { [TEST_RUN_LABEL]: this.#run.id } : {},
|
|
262
|
+
HostConfig: { ...RESOURCES },
|
|
263
|
+
};
|
|
264
|
+
}
|
|
233
265
|
/** The body of a container this process owns: the run's labels win, and the body's resources win over the defaults. */
|
|
234
266
|
#owned(body) {
|
|
235
|
-
const { Labels, HostConfig } = this
|
|
267
|
+
const { Labels, HostConfig } = this.#defaults();
|
|
236
268
|
return {
|
|
237
269
|
...body,
|
|
238
270
|
Labels: { ...body.Labels, ...Labels },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testbed.js","sourceRoot":"","sources":["../../src/docker/testbed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,qBAAqB,EAErB,MAAM,EAIN,kBAAkB,GAGnB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACL,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"testbed.js","sourceRoot":"","sources":["../../src/docker/testbed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
export declare function globalSetup(): Promise<void>;
|
|
2
|
-
/**
|
|
2
|
+
/**
|
|
3
|
+
* Synchronous: under `--test-force-exit`, Node does not await the global
|
|
4
|
+
* teardown before it exits (internal/test_runner/test, `harness.teardown()`
|
|
5
|
+
* and then `process.exit()`). It makes no engine call: the reaper of the run
|
|
6
|
+
* removes the run's engine objects after its last test process (ADR 0020).
|
|
7
|
+
*/
|
|
3
8
|
export declare function globalTeardown(): void;
|
|
4
9
|
//# sourceMappingURL=docker-global-setup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-global-setup.d.ts","sourceRoot":"","sources":["../../src/scripts/docker-global-setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docker-global-setup.d.ts","sourceRoot":"","sources":["../../src/scripts/docker-global-setup.ts"],"names":[],"mappings":"AA+HA,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CA6BjD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAyBrC"}
|
|
@@ -7,18 +7,15 @@
|
|
|
7
7
|
* engine, from any project of this user.
|
|
8
8
|
*/
|
|
9
9
|
import { randomUUID } from 'node:crypto';
|
|
10
|
-
import {
|
|
10
|
+
import { readFileSync, readdirSync, rmSync } from 'node:fs';
|
|
11
11
|
import { mkdir, readFile, readdir, rename, writeFile } from 'node:fs/promises';
|
|
12
12
|
import { homedir } from 'node:os';
|
|
13
|
-
import {
|
|
14
|
-
import { fileURLToPath } from 'node:url';
|
|
15
|
-
import { MessageChannel, Worker, receiveMessageOnPort, } from 'node:worker_threads';
|
|
13
|
+
import { join } from 'node:path';
|
|
16
14
|
import { Docker } from '@zukhruf/docker';
|
|
17
15
|
import { DockerHost } from "../docker/host.js";
|
|
16
|
+
import { REAPER_DEFAULTS, reaped, sharedDatabases, startReaper, } from "../docker/reaper.js";
|
|
18
17
|
import { TEST_RUN_DIRECTORY, TEST_RUN_ID, readRun, } from "../docker/run-records.js";
|
|
19
|
-
import {
|
|
20
|
-
/** How long the global teardown waits for its cleanup worker. */
|
|
21
|
-
const CLEANUP_TIMEOUT = 250_000;
|
|
18
|
+
import { removeRecordedPaths } from "./run-cleanup.js";
|
|
22
19
|
const codeOf = (error) => Error.isError(error) && 'code' in error ? error.code : undefined;
|
|
23
20
|
function alive(pid) {
|
|
24
21
|
try {
|
|
@@ -29,71 +26,11 @@ function alive(pid) {
|
|
|
29
26
|
return codeOf(error) !== 'ESRCH';
|
|
30
27
|
}
|
|
31
28
|
}
|
|
32
|
-
/** The
|
|
33
|
-
|
|
34
|
-
const
|
|
35
|
-
return
|
|
36
|
-
|
|
37
|
-
const pid = /^process-(\d+)-[\da-f-]{36}\.json$/.exec(file)?.[1];
|
|
38
|
-
return pid === undefined ? [] : [Number(pid)];
|
|
39
|
-
}),
|
|
40
|
-
creating: files.filter((file) => file.startsWith('creating-')).length,
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
/**
|
|
44
|
-
* Whether the engine can still finish a create of the run's directory: one
|
|
45
|
-
* of its creating records is younger than one engine call may take. The
|
|
46
|
-
* process that wrote the record can be dead, as the engine finishes a create
|
|
47
|
-
* that it received.
|
|
48
|
-
*/
|
|
49
|
-
function createInFlight(directory) {
|
|
50
|
-
const since = Date.now() - ENGINE_CALL_TIMEOUT;
|
|
51
|
-
return readdirSync(directory).some((file) => file.startsWith('creating-') &&
|
|
52
|
-
statSync(join(directory, file)).mtimeMs > since);
|
|
53
|
-
}
|
|
54
|
-
/**
|
|
55
|
-
* The cleanup worker, next to this module: `.ts` when Node runs the source,
|
|
56
|
-
* `.js` when it runs the build.
|
|
57
|
-
*/
|
|
58
|
-
function cleanupWorker() {
|
|
59
|
-
const extension = extname(import.meta.filename);
|
|
60
|
-
const url = new URL(`./docker-cleanup-worker${extension}`, import.meta.url);
|
|
61
|
-
if (!existsSync(url))
|
|
62
|
-
throw new Error(`The Docker cleanup worker is missing: ${fileURLToPath(url)}`);
|
|
63
|
-
return url;
|
|
64
|
-
}
|
|
65
|
-
/**
|
|
66
|
-
* Runs the cleanup in a worker and blocks until it ends. Under
|
|
67
|
-
* `--test-force-exit`, Node does not await the global teardown before it
|
|
68
|
-
* exits (internal/test_runner/test, `harness.teardown()` and then
|
|
69
|
-
* `process.exit()`), so the teardown cannot return to the event loop.
|
|
70
|
-
*/
|
|
71
|
-
function cleanupInWorker(run, directory) {
|
|
72
|
-
const url = cleanupWorker();
|
|
73
|
-
const signal = new SharedArrayBuffer(4);
|
|
74
|
-
const { port1, port2 } = new MessageChannel();
|
|
75
|
-
const work = { run, directory, port: port2, signal };
|
|
76
|
-
const worker = new Worker(url, {
|
|
77
|
-
execArgv: [],
|
|
78
|
-
workerData: work,
|
|
79
|
-
transferList: [port2],
|
|
80
|
-
});
|
|
81
|
-
worker.unref();
|
|
82
|
-
const waited = Atomics.wait(new Int32Array(signal), 0, 0, CLEANUP_TIMEOUT);
|
|
83
|
-
const received = receiveMessageOnPort(port1);
|
|
84
|
-
port1.close();
|
|
85
|
-
if (waited === 'timed-out' || received === undefined) {
|
|
86
|
-
void worker.terminate();
|
|
87
|
-
throw new Error(`The Docker cleanup did not finish within ${CLEANUP_TIMEOUT / 1000} s`);
|
|
88
|
-
}
|
|
89
|
-
const outcome = received.message;
|
|
90
|
-
if ('error' in outcome) {
|
|
91
|
-
const error = new Error(outcome.error.message);
|
|
92
|
-
error.name = outcome.error.name;
|
|
93
|
-
error.stack = outcome.error.detail;
|
|
94
|
-
throw error;
|
|
95
|
-
}
|
|
96
|
-
}
|
|
29
|
+
/** The pids in the process records of a run's directory. */
|
|
30
|
+
const processes = (directory) => readdirSync(directory).flatMap((file) => {
|
|
31
|
+
const pid = /^process-(\d+)-[\da-f-]{36}\.json$/.exec(file)?.[1];
|
|
32
|
+
return pid === undefined ? [] : [Number(pid)];
|
|
33
|
+
});
|
|
97
34
|
async function readRunFile(directory) {
|
|
98
35
|
try {
|
|
99
36
|
return JSON.parse(await readFile(join(directory, 'run.json'), 'utf8'));
|
|
@@ -103,16 +40,20 @@ async function readRunFile(directory) {
|
|
|
103
40
|
return undefined;
|
|
104
41
|
}
|
|
105
42
|
}
|
|
106
|
-
/**
|
|
43
|
+
/**
|
|
44
|
+
* Removes what dead runs on this engine left behind: the recorded paths, and,
|
|
45
|
+
* through the reaper of the run, its engine objects. The records of a run go
|
|
46
|
+
* once the engine has no reaper of it and nothing that one would remove
|
|
47
|
+
* (ADR 0020, item 9).
|
|
48
|
+
*/
|
|
107
49
|
async function recover(root, endpoint) {
|
|
108
|
-
// Connected only when a dead run
|
|
50
|
+
// Connected only when a dead run used Docker.
|
|
109
51
|
await using resources = new AsyncDisposableStack();
|
|
110
52
|
let engine;
|
|
111
|
-
const connection = async () => (engine ??= resources.use(await Docker.connect({
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
})));
|
|
53
|
+
const connection = async () => (engine ??= resources.use(await Docker.connect({ clock: globalThis, host: endpoint })));
|
|
54
|
+
// Listed once, for all dead runs, and only when one needs it.
|
|
55
|
+
let databases;
|
|
56
|
+
const listed = async () => (databases ??= sharedDatabases(await connection(), REAPER_DEFAULTS, globalThis));
|
|
116
57
|
for (const name of await readdir(root)) {
|
|
117
58
|
// A claim names its runner: while it lives, the run is being recovered.
|
|
118
59
|
const claimant = /^recovering-(\d+)-/.exec(name)?.[1];
|
|
@@ -124,9 +65,9 @@ async function recover(root, endpoint) {
|
|
|
124
65
|
continue;
|
|
125
66
|
// A killed runner leaves its test processes running. Each one can still
|
|
126
67
|
// create something.
|
|
127
|
-
let
|
|
68
|
+
let pids;
|
|
128
69
|
try {
|
|
129
|
-
|
|
70
|
+
pids = processes(directory);
|
|
130
71
|
}
|
|
131
72
|
catch (error) {
|
|
132
73
|
// Another runner claimed the run between the listing and this read.
|
|
@@ -134,7 +75,7 @@ async function recover(root, endpoint) {
|
|
|
134
75
|
continue;
|
|
135
76
|
throw error;
|
|
136
77
|
}
|
|
137
|
-
if (
|
|
78
|
+
if (pids.some(alive))
|
|
138
79
|
continue;
|
|
139
80
|
// Runners start in parallel; the rename lets exactly one recover a run.
|
|
140
81
|
const claimed = join(root, `recovering-${process.pid}-${randomUUID()}`);
|
|
@@ -147,14 +88,15 @@ async function recover(root, endpoint) {
|
|
|
147
88
|
throw error;
|
|
148
89
|
}
|
|
149
90
|
try {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
if (createInFlight(claimed))
|
|
155
|
-
await rename(claimed, directory);
|
|
156
|
-
else
|
|
91
|
+
removeRecordedPaths(previous, claimed);
|
|
92
|
+
// A run with no process record never reached the engine.
|
|
93
|
+
if (pids.length === 0 ||
|
|
94
|
+
(await reaped(await connection(), previous.id, listed)))
|
|
157
95
|
rmSync(claimed, { recursive: true, force: true });
|
|
96
|
+
// Its reaper still exists, or one was killed before it removed all:
|
|
97
|
+
// the records stay for a later recovery, under this claim.
|
|
98
|
+
else
|
|
99
|
+
await startReaper(await connection(), previous.id);
|
|
158
100
|
}
|
|
159
101
|
catch (error) {
|
|
160
102
|
throw new Error(`Could not recover Docker test resources. Retained ownership record: ${claimed}`, { cause: error });
|
|
@@ -184,7 +126,12 @@ export async function globalSetup() {
|
|
|
184
126
|
process.env.DOCKER_HOST = endpoint;
|
|
185
127
|
delete process.env.DOCKER_CONTEXT;
|
|
186
128
|
}
|
|
187
|
-
/**
|
|
129
|
+
/**
|
|
130
|
+
* Synchronous: under `--test-force-exit`, Node does not await the global
|
|
131
|
+
* teardown before it exits (internal/test_runner/test, `harness.teardown()`
|
|
132
|
+
* and then `process.exit()`). It makes no engine call: the reaper of the run
|
|
133
|
+
* removes the run's engine objects after its last test process (ADR 0020).
|
|
134
|
+
*/
|
|
188
135
|
export function globalTeardown() {
|
|
189
136
|
const owner = readRun(process.env);
|
|
190
137
|
if (!owner)
|
|
@@ -192,13 +139,11 @@ export function globalTeardown() {
|
|
|
192
139
|
const { directory } = owner.records;
|
|
193
140
|
try {
|
|
194
141
|
const run = JSON.parse(readFileSync(join(directory, 'run.json'), 'utf8'));
|
|
195
|
-
|
|
196
|
-
//
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
// finish, can still add something: the next run's recovery sweeps again.
|
|
201
|
-
if (!processes.some(alive) && creating === 0)
|
|
142
|
+
removeRecordedPaths(run, directory);
|
|
143
|
+
// A run whose process reached the engine keeps its records: the
|
|
144
|
+
// teardown cannot see whether its reaper acted, and a later recovery
|
|
145
|
+
// asks the engine (ADR 0020, items 6 and 9).
|
|
146
|
+
if (processes(directory).length === 0)
|
|
202
147
|
rmSync(directory, { recursive: true, force: true });
|
|
203
148
|
}
|
|
204
149
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-global-setup.js","sourceRoot":"","sources":["../../src/scripts/docker-global-setup.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"docker-global-setup.js","sourceRoot":"","sources":["../../src/scripts/docker-global-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
import type { WallClock } from '@zukhruf/async';
|
|
2
|
-
import { Docker } from '@zukhruf/docker';
|
|
3
|
-
/** How long one Engine API call of the cleanup may take. */
|
|
4
|
-
export declare const ENGINE_CALL_TIMEOUT = 240000;
|
|
5
1
|
/** What the global setup writes to run.json. */
|
|
6
2
|
export interface Run {
|
|
7
3
|
id: string;
|
|
@@ -9,14 +5,10 @@ export interface Run {
|
|
|
9
5
|
pid: number;
|
|
10
6
|
}
|
|
11
7
|
/**
|
|
12
|
-
* Removes
|
|
13
|
-
*
|
|
8
|
+
* Removes the paths that the run's records name, and then each record: the
|
|
9
|
+
* SSH forward directories and the host directories. The reaper of the run
|
|
10
|
+
* removes its engine objects (ADR 0020, item 6). Synchronous, so the global
|
|
11
|
+
* teardown finishes under `--test-force-exit`.
|
|
14
12
|
*/
|
|
15
|
-
export declare function
|
|
16
|
-
/**
|
|
17
|
-
* Connects to the run's engine, cleans the run, removes the expired shared
|
|
18
|
-
* servers, and ends the connection. Only the global teardown calls it, for a
|
|
19
|
-
* run that used Docker.
|
|
20
|
-
*/
|
|
21
|
-
export declare function connectAndCleanup(previous: Run, directory: string, clock: WallClock): Promise<void>;
|
|
13
|
+
export declare function removeRecordedPaths(run: Run, directory: string): void;
|
|
22
14
|
//# sourceMappingURL=run-cleanup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-cleanup.d.ts","sourceRoot":"","sources":["../../src/scripts/run-cleanup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-cleanup.d.ts","sourceRoot":"","sources":["../../src/scripts/run-cleanup.ts"],"names":[],"mappings":"AAOA,gDAAgD;AAChD,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAOD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA4BrE"}
|