@zukhruf/testing 0.3.45 → 0.3.47
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 +58 -48
- package/dist/databases/clickhouse.d.ts +2 -2
- package/dist/databases/clickhouse.d.ts.map +1 -1
- package/dist/databases/clickhouse.js +6 -5
- package/dist/databases/clickhouse.js.map +1 -1
- package/dist/databases/collector.d.ts +1 -2
- package/dist/databases/collector.d.ts.map +1 -1
- package/dist/databases/collector.js +2 -2
- package/dist/databases/collector.js.map +1 -1
- package/dist/databases/database.d.ts +2 -2
- package/dist/databases/database.d.ts.map +1 -1
- package/dist/databases/mysql-family-server.d.ts.map +1 -1
- package/dist/databases/mysql-family-server.js +14 -14
- package/dist/databases/mysql-family-server.js.map +1 -1
- package/dist/databases/postgres.d.ts.map +1 -1
- package/dist/databases/postgres.js +18 -15
- package/dist/databases/postgres.js.map +1 -1
- package/dist/databases/sqlserver.d.ts.map +1 -1
- package/dist/databases/sqlserver.js +19 -16
- package/dist/databases/sqlserver.js.map +1 -1
- package/dist/docker/directory.d.ts +2 -2
- package/dist/docker/directory.d.ts.map +1 -1
- package/dist/docker/directory.js +3 -3
- package/dist/docker/directory.js.map +1 -1
- package/dist/docker/engine-lease.d.ts +36 -0
- package/dist/docker/engine-lease.d.ts.map +1 -0
- package/dist/docker/engine-lease.js +141 -0
- package/dist/docker/engine-lease.js.map +1 -0
- package/dist/docker/host.d.ts +2 -2
- package/dist/docker/host.d.ts.map +1 -1
- package/dist/docker/host.js +5 -5
- package/dist/docker/host.js.map +1 -1
- package/dist/docker/index.d.ts +1 -2
- package/dist/docker/index.d.ts.map +1 -1
- package/dist/docker/index.js +1 -2
- package/dist/docker/index.js.map +1 -1
- package/dist/docker/{test-run.d.ts → run-records.d.ts} +22 -16
- package/dist/docker/run-records.d.ts.map +1 -0
- package/dist/docker/{test-run.js → run-records.js} +22 -27
- package/dist/docker/run-records.js.map +1 -0
- package/dist/docker/{fixtures.d.ts → testbed.d.ts} +26 -42
- package/dist/docker/testbed.d.ts.map +1 -0
- package/dist/docker/{fixtures.js → testbed.js} +108 -106
- package/dist/docker/testbed.js.map +1 -0
- package/dist/scripts/docker-global-setup.js +11 -10
- package/dist/scripts/docker-global-setup.js.map +1 -1
- package/dist/scripts/run-cleanup.d.ts.map +1 -1
- package/dist/scripts/run-cleanup.js +85 -18
- package/dist/scripts/run-cleanup.js.map +1 -1
- package/package.json +2 -2
- package/dist/docker/fixtures.d.ts.map +0 -1
- package/dist/docker/fixtures.js.map +0 -1
- package/dist/docker/test-run.d.ts.map +0 -1
- package/dist/docker/test-run.js.map +0 -1
|
@@ -3,9 +3,10 @@ import { readFileSync } from 'node:fs';
|
|
|
3
3
|
import pMemoize from 'p-memoize';
|
|
4
4
|
import { ConnectionFailedError, Docker, ImageNotFoundError, } from '@zukhruf/docker';
|
|
5
5
|
import { DockerDirectory } from "./directory.js";
|
|
6
|
+
import { EngineLease, LEASE_LABEL, sweepLeaseName } from "./engine-lease.js";
|
|
6
7
|
import { DockerHost } from "./host.js";
|
|
8
|
+
import { TEST_RUN_LABEL, readRun } from "./run-records.js";
|
|
7
9
|
import { ServiceContainer } from "./service-container.js";
|
|
8
|
-
import { TestRun } from "./test-run.js";
|
|
9
10
|
/** Marks a server that `reuse()` shares across processes and runs. */
|
|
10
11
|
export const SHARED_SERVER_LABEL = 'dev.zukhruf.testing.shared';
|
|
11
12
|
/** The fingerprint of a shared server's configuration. */
|
|
@@ -14,21 +15,14 @@ export const CONFIG_LABEL = 'dev.zukhruf.testing.config';
|
|
|
14
15
|
export const VERSION_LABEL = 'dev.zukhruf.testing.version';
|
|
15
16
|
/** The version of this package: `../../package.json` from `src/docker` and from `dist/docker`. */
|
|
16
17
|
export const { version: PACKAGE_VERSION } = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8'));
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
/** Bytes of a size such as `1g`, in the binary units of the Docker CLI's `--memory`. */
|
|
26
|
-
function bytes(size) {
|
|
27
|
-
const match = /^(\d+(?:\.\d+)?)\s?([bkmgtp])?i?b?$/i.exec(size);
|
|
28
|
-
if (!match?.[1])
|
|
29
|
-
throw new Error(`Invalid memory size: ${size}`);
|
|
30
|
-
return Math.trunc(Number(match[1]) * (units[match[2]?.toLowerCase() ?? 'b'] ?? 1));
|
|
31
|
-
}
|
|
18
|
+
/** The default resources: they protect a shared engine, such as an SSH engine that runs real applications. */
|
|
19
|
+
const RESOURCES = { Memory: 1024 ** 3, NanoCpus: 1e9 };
|
|
20
|
+
/**
|
|
21
|
+
* The process lease of this process on each engine, by the engine's host.
|
|
22
|
+
* One process builds many testbeds, so the lease belongs to the module. A
|
|
23
|
+
* lease whose attach ended is taken again by the next reuse().
|
|
24
|
+
*/
|
|
25
|
+
const processLeases = new Map();
|
|
32
26
|
const byKey = ([a], [b]) => {
|
|
33
27
|
if (a < b)
|
|
34
28
|
return -1;
|
|
@@ -36,18 +30,29 @@ const byKey = ([a], [b]) => {
|
|
|
36
30
|
return 1;
|
|
37
31
|
return 0;
|
|
38
32
|
};
|
|
39
|
-
|
|
33
|
+
/** The value with its object keys sorted and its `Env` entries sorted; every other array keeps its order. */
|
|
34
|
+
function canonical(value, key) {
|
|
35
|
+
if (Array.isArray(value)) {
|
|
36
|
+
const items = value.map((item) => canonical(item));
|
|
37
|
+
return key === 'Env' ? items.toSorted() : items;
|
|
38
|
+
}
|
|
39
|
+
if (typeof value === 'object' && value !== null)
|
|
40
|
+
return Object.fromEntries(Object.entries(value)
|
|
41
|
+
.toSorted(byKey)
|
|
42
|
+
.map(([name, item]) => [name, canonical(item, name)]));
|
|
43
|
+
return value;
|
|
44
|
+
}
|
|
40
45
|
/**
|
|
41
|
-
*
|
|
46
|
+
* A testbed of containers on the engine that `environment` selects. The engine is
|
|
42
47
|
* connected on the first acquisition and kept: handles keep the engine they
|
|
43
48
|
* were made on. Docker owns cross-process coordination; this instance holds
|
|
44
49
|
* no server cache.
|
|
45
50
|
*/
|
|
46
|
-
export class
|
|
51
|
+
export class DockerTestbed {
|
|
47
52
|
#environment;
|
|
48
53
|
#run;
|
|
49
54
|
#engine = pMemoize(async () => {
|
|
50
|
-
this.#run?.recordThisProcess();
|
|
55
|
+
this.#run?.records.recordThisProcess();
|
|
51
56
|
const client = await Docker.connect({
|
|
52
57
|
environment: this.#environment,
|
|
53
58
|
}).catch((error) => {
|
|
@@ -67,7 +72,7 @@ export class DockerFixtures {
|
|
|
67
72
|
});
|
|
68
73
|
constructor({ environment }) {
|
|
69
74
|
this.#environment = environment;
|
|
70
|
-
this.#run =
|
|
75
|
+
this.#run = readRun(environment);
|
|
71
76
|
}
|
|
72
77
|
/**
|
|
73
78
|
* Defaults for disposable test containers, including external launchers.
|
|
@@ -75,10 +80,10 @@ export class DockerFixtures {
|
|
|
75
80
|
* the read records this process, so the global teardown sweeps the run.
|
|
76
81
|
*/
|
|
77
82
|
get defaults() {
|
|
78
|
-
this.#run?.recordThisProcess();
|
|
83
|
+
this.#run?.records.recordThisProcess();
|
|
79
84
|
return {
|
|
80
|
-
|
|
81
|
-
|
|
85
|
+
Labels: this.#run ? { [TEST_RUN_LABEL]: this.#run.id } : {},
|
|
86
|
+
HostConfig: { ...RESOURCES },
|
|
82
87
|
};
|
|
83
88
|
}
|
|
84
89
|
/** The client of the engine that this instance's handles are on. */
|
|
@@ -94,53 +99,76 @@ export class DockerFixtures {
|
|
|
94
99
|
const { client } = await this.#engine();
|
|
95
100
|
return client.volumes.create({
|
|
96
101
|
Name: `zukhruf-testing-${randomUUID()}`,
|
|
97
|
-
Labels: this.defaults.
|
|
102
|
+
Labels: this.defaults.Labels,
|
|
98
103
|
});
|
|
99
104
|
}
|
|
100
105
|
/** Starts a container this process owns. It stays after it stops, until disposal removes it. */
|
|
101
|
-
async start(options) {
|
|
106
|
+
async start(body, options) {
|
|
102
107
|
const engine = await this.#engine();
|
|
103
|
-
const container = await this.#
|
|
104
|
-
name: options.name ?? generatedName(options.image),
|
|
105
|
-
});
|
|
108
|
+
const container = await this.#creating(engine, () => engine.client.containers.create(this.#owned(body), options));
|
|
106
109
|
await this.#startOrRemove(container);
|
|
107
110
|
return container;
|
|
108
111
|
}
|
|
109
|
-
/**
|
|
110
|
-
|
|
112
|
+
/**
|
|
113
|
+
* Starts a dedicated server. Failure or disposal removes it. A server that
|
|
114
|
+
* is not ready rejects with its container's output, read before the removal.
|
|
115
|
+
*/
|
|
116
|
+
async serve(body, options) {
|
|
111
117
|
const engine = await this.#engine();
|
|
112
|
-
const
|
|
113
|
-
const container = await this.#
|
|
118
|
+
const published = this.#published(this.#owned(body), options.internalPort);
|
|
119
|
+
const container = await this.#creating(engine, () => engine.client.containers.create(published, options));
|
|
114
120
|
const remove = () => container.remove({ force: true, v: true });
|
|
115
121
|
await this.#startOrRemove(container);
|
|
116
122
|
try {
|
|
117
123
|
return await this.#ready(engine, container, options, remove);
|
|
118
124
|
}
|
|
119
125
|
catch (error) {
|
|
126
|
+
const output = await container.logs().then((logs) => logs.output, () => undefined);
|
|
120
127
|
await remove().catch(() => { });
|
|
121
|
-
|
|
128
|
+
if (output === undefined)
|
|
129
|
+
throw error;
|
|
130
|
+
throw new Error(`Container ${container.id} was not ready:\n${output}`, {
|
|
131
|
+
cause: error,
|
|
132
|
+
});
|
|
122
133
|
}
|
|
123
134
|
}
|
|
124
135
|
/**
|
|
125
136
|
* Reuse one server per configuration on this engine, across processes and
|
|
126
137
|
* runs. Docker reserves the name atomically. Readiness failure leaves it
|
|
127
138
|
* running. Disposal closes only the forward; the server keeps running for
|
|
128
|
-
* its other users.
|
|
139
|
+
* its other users. The engine removes the server when it stops.
|
|
129
140
|
*/
|
|
130
|
-
async reuse(options) {
|
|
141
|
+
async reuse(body, options) {
|
|
131
142
|
const engine = await this.#engine();
|
|
132
|
-
|
|
143
|
+
// Publish this process's lease, then read the sweep lease (ADR 0014).
|
|
144
|
+
await this.#processLease(engine);
|
|
145
|
+
await EngineLease.gone(engine.client, sweepLeaseName(PACKAGE_VERSION));
|
|
146
|
+
const configured = {
|
|
147
|
+
...body,
|
|
148
|
+
HostConfig: { ...RESOURCES, ...body.HostConfig },
|
|
149
|
+
};
|
|
150
|
+
const fingerprint = createHash('sha256')
|
|
151
|
+
.update(JSON.stringify(canonical({
|
|
152
|
+
version: PACKAGE_VERSION,
|
|
153
|
+
internalPort: options.internalPort,
|
|
154
|
+
body: configured,
|
|
155
|
+
})))
|
|
156
|
+
.digest('hex');
|
|
133
157
|
const name = options.name ?? `zukhruf-testing-${fingerprint}`;
|
|
134
|
-
const
|
|
135
|
-
...
|
|
136
|
-
|
|
137
|
-
...
|
|
158
|
+
const published = this.#published({
|
|
159
|
+
...configured,
|
|
160
|
+
Labels: {
|
|
161
|
+
...configured.Labels,
|
|
138
162
|
[SHARED_SERVER_LABEL]: '1',
|
|
139
163
|
[CONFIG_LABEL]: fingerprint,
|
|
140
164
|
[VERSION_LABEL]: PACKAGE_VERSION,
|
|
141
165
|
},
|
|
142
|
-
}
|
|
143
|
-
const
|
|
166
|
+
}, options.internalPort);
|
|
167
|
+
const shared = {
|
|
168
|
+
...published,
|
|
169
|
+
HostConfig: { ...published.HostConfig, AutoRemove: true },
|
|
170
|
+
};
|
|
171
|
+
const { container } = await this.#creating(engine, () => engine.client.containers.createOrGet(shared, { name }));
|
|
144
172
|
const inspected = await container.inspect();
|
|
145
173
|
const labels = inspected.Config?.Labels;
|
|
146
174
|
if (labels?.[SHARED_SERVER_LABEL] !== '1' ||
|
|
@@ -151,22 +179,41 @@ export class DockerFixtures {
|
|
|
151
179
|
return this.#ready(engine, container, options, undefined);
|
|
152
180
|
}
|
|
153
181
|
/** Runs a container to completion and gives its output and exit code. The container is removed afterwards. */
|
|
154
|
-
async run(options) {
|
|
182
|
+
async run(body, options) {
|
|
155
183
|
const engine = await this.#engine();
|
|
156
|
-
const
|
|
157
|
-
return this.#creating(engine, () => engine.client.containers.run(
|
|
158
|
-
name: options.name ?? generatedName(options.image),
|
|
159
|
-
}));
|
|
184
|
+
const owned = this.#owned(body);
|
|
185
|
+
return this.#creating(engine, () => engine.client.containers.run(owned, options));
|
|
160
186
|
}
|
|
161
|
-
|
|
162
|
-
|
|
187
|
+
/** The process lease of this process on the engine: a sweep keeps the shared servers of this version while it runs. */
|
|
188
|
+
async #processLease(engine) {
|
|
189
|
+
const host = engine.client.host;
|
|
190
|
+
const taken = processLeases.get(host);
|
|
191
|
+
if (taken !== undefined)
|
|
192
|
+
return taken;
|
|
193
|
+
const taking = this.#creating(engine, async () => {
|
|
194
|
+
const lease = await EngineLease.take(engine.client, {
|
|
195
|
+
...this.defaults.Labels,
|
|
196
|
+
[LEASE_LABEL]: 'process',
|
|
197
|
+
[VERSION_LABEL]: PACKAGE_VERSION,
|
|
198
|
+
});
|
|
199
|
+
if (lease === undefined)
|
|
200
|
+
throw new Error('The engine removed the process lease before its start');
|
|
201
|
+
return lease;
|
|
202
|
+
});
|
|
203
|
+
processLeases.set(host, taking);
|
|
204
|
+
const forget = () => {
|
|
205
|
+
if (processLeases.get(host) === taking)
|
|
206
|
+
processLeases.delete(host);
|
|
207
|
+
};
|
|
208
|
+
taking.then((lease) => lease.closed().then(forget), forget);
|
|
209
|
+
return taking;
|
|
163
210
|
}
|
|
164
211
|
/**
|
|
165
212
|
* Runs `create` under a creating record, and pulls a missing image before
|
|
166
213
|
* a second try, as `docker run` does.
|
|
167
214
|
*/
|
|
168
215
|
async #creating(engine, create) {
|
|
169
|
-
await using _creating = await this.#run?.recordCreating();
|
|
216
|
+
await using _creating = await this.#run?.records.recordCreating();
|
|
170
217
|
try {
|
|
171
218
|
return await create();
|
|
172
219
|
}
|
|
@@ -201,14 +248,16 @@ export class DockerFixtures {
|
|
|
201
248
|
throw error;
|
|
202
249
|
}
|
|
203
250
|
}
|
|
204
|
-
/** The body of a container this process owns:
|
|
205
|
-
#owned(
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
251
|
+
/** The body of a container this process owns: the run's labels win, and the body's resources win over the defaults. */
|
|
252
|
+
#owned(body) {
|
|
253
|
+
const { Labels, HostConfig } = this.defaults;
|
|
254
|
+
return {
|
|
255
|
+
...body,
|
|
256
|
+
Labels: { ...body.Labels, ...Labels },
|
|
257
|
+
HostConfig: { ...HostConfig, ...body.HostConfig },
|
|
258
|
+
};
|
|
210
259
|
}
|
|
211
|
-
/** Publishes `internalPort` on 127.0.0.1 of the engine's host
|
|
260
|
+
/** Publishes `internalPort` on 127.0.0.1 of the engine's host. */
|
|
212
261
|
#published(body, internalPort) {
|
|
213
262
|
const port = `${internalPort}/tcp`;
|
|
214
263
|
return {
|
|
@@ -216,56 +265,9 @@ export class DockerFixtures {
|
|
|
216
265
|
ExposedPorts: { [port]: {} },
|
|
217
266
|
HostConfig: {
|
|
218
267
|
...body.HostConfig,
|
|
219
|
-
AutoRemove: true,
|
|
220
268
|
PortBindings: { [port]: [{ HostIp: '127.0.0.1', HostPort: '' }] },
|
|
221
269
|
},
|
|
222
270
|
};
|
|
223
271
|
}
|
|
224
|
-
#body(options) {
|
|
225
|
-
const { resources } = this.defaults;
|
|
226
|
-
const hostConfig = {
|
|
227
|
-
Binds: (options.mounts ?? []).map(({ source, target, readOnly }) => `${source}:${target}${readOnly ? ':ro' : ''}`),
|
|
228
|
-
Tmpfs: Object.fromEntries((options.tmpfs ?? []).map((spec) => {
|
|
229
|
-
const separator = spec.indexOf(':');
|
|
230
|
-
return separator === -1
|
|
231
|
-
? [spec, '']
|
|
232
|
-
: [spec.slice(0, separator), spec.slice(separator + 1)];
|
|
233
|
-
})),
|
|
234
|
-
Memory: bytes(options.memory ?? resources.memory),
|
|
235
|
-
NanoCpus: Math.round((options.cpus ?? resources.cpus) * 1e9),
|
|
236
|
-
...(options.ipcHost ? { IpcMode: 'host' } : {}),
|
|
237
|
-
...(options.memorySwappiness === undefined
|
|
238
|
-
? {}
|
|
239
|
-
: { MemorySwappiness: options.memorySwappiness }),
|
|
240
|
-
};
|
|
241
|
-
return {
|
|
242
|
-
Image: options.image,
|
|
243
|
-
...(options.command ? { Cmd: options.command } : {}),
|
|
244
|
-
...(options.hostname ? { Hostname: options.hostname } : {}),
|
|
245
|
-
Labels: options.labels ?? {},
|
|
246
|
-
Env: Object.entries(options.env ?? {}).map(([key, value]) => `${key}=${value}`),
|
|
247
|
-
HostConfig: hostConfig,
|
|
248
|
-
};
|
|
249
|
-
}
|
|
250
|
-
#fingerprint(options) {
|
|
251
|
-
const { resources } = this.defaults;
|
|
252
|
-
return createHash('sha256')
|
|
253
|
-
.update(JSON.stringify({
|
|
254
|
-
version: PACKAGE_VERSION,
|
|
255
|
-
memory: options.memory ?? resources.memory,
|
|
256
|
-
cpus: options.cpus ?? resources.cpus,
|
|
257
|
-
image: options.image,
|
|
258
|
-
command: options.command ?? [],
|
|
259
|
-
hostname: options.hostname,
|
|
260
|
-
internalPort: options.internalPort,
|
|
261
|
-
env: Object.entries(options.env ?? {}).sort(byKey),
|
|
262
|
-
labels: Object.entries(options.labels ?? {}).sort(byKey),
|
|
263
|
-
mounts: options.mounts ?? [],
|
|
264
|
-
tmpfs: options.tmpfs ?? [],
|
|
265
|
-
ipcHost: Boolean(options.ipcHost),
|
|
266
|
-
memorySwappiness: options.memorySwappiness,
|
|
267
|
-
}))
|
|
268
|
-
.digest('hex');
|
|
269
|
-
}
|
|
270
272
|
}
|
|
271
|
-
//# sourceMappingURL=
|
|
273
|
+
//# sourceMappingURL=testbed.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testbed.js","sourceRoot":"","sources":["../../src/docker/testbed.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* The Docker global setup and teardown for `node --test
|
|
3
3
|
* --test-global-setup=<file>`, where the file re-exports both functions. The
|
|
4
4
|
* setup starts one run: its test processes tie what they create to the run
|
|
5
|
-
* (see
|
|
5
|
+
* (see readRun), and the teardown removes it after they exit.
|
|
6
6
|
* A run that was killed before it could is removed by a later run on the same
|
|
7
7
|
* engine, from any project of this user.
|
|
8
8
|
*/
|
|
@@ -15,7 +15,7 @@ import { fileURLToPath } from 'node:url';
|
|
|
15
15
|
import { MessageChannel, Worker, receiveMessageOnPort, } from 'node:worker_threads';
|
|
16
16
|
import { Docker } from '@zukhruf/docker';
|
|
17
17
|
import { DockerHost } from "../docker/host.js";
|
|
18
|
-
import { TEST_RUN_DIRECTORY, TEST_RUN_ID,
|
|
18
|
+
import { TEST_RUN_DIRECTORY, TEST_RUN_ID, readRun, } from "../docker/run-records.js";
|
|
19
19
|
import { ENGINE_CALL_TIMEOUT, cleanup } from "./run-cleanup.js";
|
|
20
20
|
/** How long the global teardown waits for its cleanup worker. */
|
|
21
21
|
const CLEANUP_TIMEOUT = 250_000;
|
|
@@ -83,7 +83,7 @@ function cleanupInWorker(run, directory) {
|
|
|
83
83
|
throw error;
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
|
-
async function
|
|
86
|
+
async function readRunFile(directory) {
|
|
87
87
|
try {
|
|
88
88
|
return JSON.parse(await readFile(join(directory, 'run.json'), 'utf8'));
|
|
89
89
|
}
|
|
@@ -107,7 +107,7 @@ async function recover(root, endpoint) {
|
|
|
107
107
|
if (claimant !== undefined && alive(Number(claimant)))
|
|
108
108
|
continue;
|
|
109
109
|
const directory = join(root, name);
|
|
110
|
-
const previous = await
|
|
110
|
+
const previous = await readRunFile(directory);
|
|
111
111
|
if (!previous || previous.endpoint !== endpoint || alive(previous.pid))
|
|
112
112
|
continue;
|
|
113
113
|
// A killed runner leaves its test processes running. Each one can still
|
|
@@ -169,23 +169,24 @@ export async function globalSetup() {
|
|
|
169
169
|
}
|
|
170
170
|
/** Synchronous: see cleanupInWorker. */
|
|
171
171
|
export function globalTeardown() {
|
|
172
|
-
const owner =
|
|
172
|
+
const owner = readRun(process.env);
|
|
173
173
|
if (!owner)
|
|
174
174
|
throw new Error(`The Docker global teardown runs after its global setup, which sets ${TEST_RUN_ID} and ${TEST_RUN_DIRECTORY}`);
|
|
175
|
+
const { directory } = owner.records;
|
|
175
176
|
try {
|
|
176
|
-
const run = JSON.parse(readFileSync(join(
|
|
177
|
-
const { processes, creating } = records(
|
|
177
|
+
const run = JSON.parse(readFileSync(join(directory, 'run.json'), 'utf8'));
|
|
178
|
+
const { processes, creating } = records(directory);
|
|
178
179
|
// No test process recorded itself, so the run created nothing.
|
|
179
180
|
if (processes.length > 0 || creating > 0)
|
|
180
|
-
cleanupInWorker(run,
|
|
181
|
+
cleanupInWorker(run, directory);
|
|
181
182
|
// A process that still lives, or a create that the engine can still
|
|
182
183
|
// finish, can still add something: the next run's recovery sweeps again.
|
|
183
184
|
if (!processes.some(alive) && creating === 0)
|
|
184
|
-
rmSync(
|
|
185
|
+
rmSync(directory, { recursive: true, force: true });
|
|
185
186
|
}
|
|
186
187
|
catch (error) {
|
|
187
188
|
// Node sets exit code 1 for a teardown that throws, but prints nothing.
|
|
188
|
-
console.error(`Docker test cleanup failed; retained ownership record for retry: ${
|
|
189
|
+
console.error(`Docker test cleanup failed; retained ownership record for retry: ${directory}`, error);
|
|
189
190
|
process.exitCode = 1;
|
|
190
191
|
}
|
|
191
192
|
}
|
|
@@ -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,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,cAAc,EACd,MAAM,EACN,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,OAAO,GACR,MAAM,
|
|
1
|
+
{"version":3,"file":"docker-global-setup.js","sourceRoot":"","sources":["../../src/scripts/docker-global-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-cleanup.d.ts","sourceRoot":"","sources":["../../src/scripts/run-cleanup.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"run-cleanup.d.ts","sourceRoot":"","sources":["../../src/scripts/run-cleanup.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,MAAM,EAEP,MAAM,iBAAiB,CAAC;AA0BzB,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAE3C,gDAAgD;AAChD,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAuHD;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAgDf;AA4FD;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAQf"}
|
|
@@ -10,11 +10,12 @@ import { execFile } from 'node:child_process';
|
|
|
10
10
|
import { readFile, readdir, rm } from 'node:fs/promises';
|
|
11
11
|
import { join } from 'node:path';
|
|
12
12
|
import { promisify } from 'node:util';
|
|
13
|
-
import { Docker } from '@zukhruf/docker';
|
|
13
|
+
import { ContainerNotFoundError, Docker, ImageNotFoundError, } from '@zukhruf/docker';
|
|
14
14
|
import { KIND_LABEL, ownedBy, } from "../databases/collector.js";
|
|
15
|
-
import {
|
|
15
|
+
import { EngineLease, LEASE_IMAGE, LEASE_LABEL, sweepLeaseName, } from "../docker/engine-lease.js";
|
|
16
16
|
import { DockerHost, SHELL_TIMEOUT, quote } from "../docker/host.js";
|
|
17
|
-
import { TEST_RUN_LABEL,
|
|
17
|
+
import { TEST_RUN_LABEL, directoryPrefix, forwardPrefix, } from "../docker/run-records.js";
|
|
18
|
+
import { PACKAGE_VERSION, SHARED_SERVER_LABEL, VERSION_LABEL, } from "../docker/testbed.js";
|
|
18
19
|
/** How long one Engine API call of the cleanup may take. */
|
|
19
20
|
export const ENGINE_CALL_TIMEOUT = 240_000;
|
|
20
21
|
const execute = promisify(execFile);
|
|
@@ -77,8 +78,15 @@ async function dropDatabases(engine, host, runId, signal) {
|
|
|
77
78
|
});
|
|
78
79
|
if (!container)
|
|
79
80
|
continue;
|
|
80
|
-
|
|
81
|
-
|
|
81
|
+
// Another run's teardown can remove it after the find.
|
|
82
|
+
const inspected = await container
|
|
83
|
+
.inspect({ signal: signal() })
|
|
84
|
+
.catch((error) => {
|
|
85
|
+
if (error instanceof ContainerNotFoundError)
|
|
86
|
+
return undefined;
|
|
87
|
+
throw error;
|
|
88
|
+
});
|
|
89
|
+
if (!inspected?.State?.Running)
|
|
82
90
|
continue;
|
|
83
91
|
const environment = Object.fromEntries((inspected.Config?.Env ?? []).map((entry) => {
|
|
84
92
|
const separator = entry.indexOf('=');
|
|
@@ -114,7 +122,6 @@ async function readRecordedPath(file) {
|
|
|
114
122
|
*/
|
|
115
123
|
export async function cleanup(engine, previous, directory) {
|
|
116
124
|
const host = new DockerHost(previous.endpoint, undefined);
|
|
117
|
-
const owner = new TestRun(previous.id, directory);
|
|
118
125
|
const signal = () => AbortSignal.timeout(ENGINE_CALL_TIMEOUT);
|
|
119
126
|
// Labels are attached atomically at creation. Never prune an engine,
|
|
120
127
|
// remove a shared server here, or trust names alone as proof of ownership.
|
|
@@ -141,13 +148,15 @@ export async function cleanup(engine, previous, directory) {
|
|
|
141
148
|
for (const file of await readdir(directory)) {
|
|
142
149
|
if (file.startsWith('forward-')) {
|
|
143
150
|
const path = await readRecordedPath(join(directory, file));
|
|
144
|
-
if (!path.startsWith(forwardPrefix(
|
|
151
|
+
if (!path.startsWith(forwardPrefix(previous.id)) ||
|
|
152
|
+
path.slice(5).includes('/'))
|
|
145
153
|
throw new Error(`Invalid SSH forwarding cleanup record: ${path}`);
|
|
146
154
|
await rm(path, { recursive: true, force: true });
|
|
147
155
|
}
|
|
148
156
|
else if (file.startsWith('directory-')) {
|
|
149
157
|
const path = await readRecordedPath(join(directory, file));
|
|
150
|
-
if (!path.includes(`/${directoryPrefix(
|
|
158
|
+
if (!path.includes(`/${directoryPrefix(previous.id)}`) ||
|
|
159
|
+
path.includes('/../'))
|
|
151
160
|
throw new Error(`Invalid fixture cleanup record: ${path}`);
|
|
152
161
|
if (host.remote)
|
|
153
162
|
await execute('ssh', [...host.sshArgs(), `rm -rf -- ${quote(path)}`], {
|
|
@@ -159,24 +168,82 @@ export async function cleanup(engine, previous, directory) {
|
|
|
159
168
|
}
|
|
160
169
|
await dropDatabases(engine, host, previous.id, signal);
|
|
161
170
|
}
|
|
171
|
+
/** The tries of a teardown to take a sweep lease that another holder has. */
|
|
172
|
+
const SWEEP_LEASE_TRIES = 3;
|
|
173
|
+
/** How long a teardown waits for the sweep lease of one version that another holder has. */
|
|
174
|
+
const SWEEP_LEASE_WAIT = 30_000;
|
|
175
|
+
/**
|
|
176
|
+
* Takes the sweep lease of `version`, and pulls its image when the engine
|
|
177
|
+
* does not have it. When the name is taken, it waits until that lease is
|
|
178
|
+
* gone, as a test process does, and tries again: a teardown killed before
|
|
179
|
+
* the start of its lease leaves it created, and the wait removes it. Gives
|
|
180
|
+
* undefined when each try found the name taken, or when the wait took
|
|
181
|
+
* longer than SWEEP_LEASE_WAIT: the servers of the version stay for a
|
|
182
|
+
* later teardown, and another teardown's sweep never fails this run.
|
|
183
|
+
*/
|
|
184
|
+
async function takeSweepLease(engine, version, signal) {
|
|
185
|
+
const name = sweepLeaseName(version);
|
|
186
|
+
const take = () => EngineLease.take(engine, { [LEASE_LABEL]: 'sweep', [VERSION_LABEL]: version }, { name, signal: signal() });
|
|
187
|
+
const wait = AbortSignal.timeout(SWEEP_LEASE_WAIT);
|
|
188
|
+
for (let tries = 0; tries < SWEEP_LEASE_TRIES; tries += 1) {
|
|
189
|
+
let lease;
|
|
190
|
+
try {
|
|
191
|
+
lease = await take();
|
|
192
|
+
}
|
|
193
|
+
catch (error) {
|
|
194
|
+
if (!(error instanceof ImageNotFoundError))
|
|
195
|
+
throw error;
|
|
196
|
+
await engine.images.pull(LEASE_IMAGE, { signal: signal() });
|
|
197
|
+
lease = await take();
|
|
198
|
+
}
|
|
199
|
+
if (lease !== undefined)
|
|
200
|
+
return lease;
|
|
201
|
+
try {
|
|
202
|
+
await EngineLease.gone(engine, name, { signal: wait });
|
|
203
|
+
}
|
|
204
|
+
catch (error) {
|
|
205
|
+
if (wait.aborted)
|
|
206
|
+
return undefined;
|
|
207
|
+
throw error;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
return undefined;
|
|
211
|
+
}
|
|
162
212
|
/**
|
|
163
213
|
* Removes each shared server whose version label is not this package's
|
|
164
|
-
* version,
|
|
214
|
+
* version (ADR 0012), unless a test process of that version holds a process
|
|
215
|
+
* lease (ADR 0014). The sweep lease of the version comes first, and the look
|
|
216
|
+
* for process leases after it. A server with no version label has no lease.
|
|
165
217
|
*/
|
|
166
218
|
async function removeOtherVersions(engine) {
|
|
167
219
|
const signal = () => AbortSignal.timeout(ENGINE_CALL_TIMEOUT);
|
|
168
|
-
|
|
220
|
+
const versions = Map.groupBy((await engine.containers.list({
|
|
169
221
|
all: true,
|
|
170
222
|
filters: { label: [`${SHARED_SERVER_LABEL}=1`] },
|
|
171
223
|
signal: signal(),
|
|
172
|
-
})) {
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
224
|
+
})).filter(({ Labels }) => Labels?.[VERSION_LABEL] !== PACKAGE_VERSION), ({ Labels }) => Labels?.[VERSION_LABEL]);
|
|
225
|
+
for (const [version, servers] of versions) {
|
|
226
|
+
await using lease = version === undefined
|
|
227
|
+
? undefined
|
|
228
|
+
: await takeSweepLease(engine, version, signal);
|
|
229
|
+
if (version !== undefined) {
|
|
230
|
+
// Other teardowns held the sweep lease on each try.
|
|
231
|
+
if (lease === undefined)
|
|
232
|
+
continue;
|
|
233
|
+
const holders = await engine.containers.list({
|
|
234
|
+
filters: {
|
|
235
|
+
label: [`${LEASE_LABEL}=process`, `${VERSION_LABEL}=${version}`],
|
|
236
|
+
},
|
|
237
|
+
signal: signal(),
|
|
238
|
+
});
|
|
239
|
+
if (holders.length > 0)
|
|
240
|
+
continue;
|
|
241
|
+
}
|
|
242
|
+
for (const { Id } of servers) {
|
|
243
|
+
// Another run's teardown can remove it first.
|
|
244
|
+
const container = await engine.containers.find(Id, { signal: signal() });
|
|
245
|
+
await container?.remove({ force: true, v: true, signal: signal() });
|
|
246
|
+
}
|
|
180
247
|
}
|
|
181
248
|
}
|
|
182
249
|
/**
|