@git.zone/cli 7.4.0 → 8.0.0
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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/mod_release/helpers.npmpackages.d.ts +5 -3
- package/dist_ts/mod_release/helpers.npmpackages.js +6 -4
- package/dist_ts/mod_services/classes.dockercontainer.d.ts +13 -2
- package/dist_ts/mod_services/classes.dockercontainer.js +40 -40
- package/dist_ts/mod_services/classes.globalregistry.d.ts +12 -0
- package/dist_ts/mod_services/classes.globalregistry.js +96 -13
- package/dist_ts/mod_services/classes.globalregistrystore.d.ts +7 -1
- package/dist_ts/mod_services/classes.globalregistrystore.js +6 -6
- package/dist_ts/mod_services/classes.legacymongomigration.d.ts +239 -0
- package/dist_ts/mod_services/classes.legacymongomigration.js +970 -0
- package/dist_ts/mod_services/classes.serviceconfiguration.d.ts +18 -8
- package/dist_ts/mod_services/classes.serviceconfiguration.js +47 -35
- package/dist_ts/mod_services/classes.servicedatamarker.d.ts +42 -1
- package/dist_ts/mod_services/classes.servicedatamarker.js +101 -8
- package/dist_ts/mod_services/classes.servicemanager.d.ts +99 -33
- package/dist_ts/mod_services/classes.servicemanager.js +652 -384
- package/dist_ts/mod_services/classes.servicepruner.js +27 -20
- package/dist_ts/mod_services/index.js +51 -7
- package/dist_ts/mod_services/mod.plugins.d.ts +2 -1
- package/dist_ts/mod_services/mod.plugins.js +4 -2
- package/dist_ts_migration/002.runtime-config.d.ts +1 -1
- package/dist_ts_migration/002.runtime-config.js +8 -2
- package/dist_ts_migration/003.service-data-marker.js +125 -30
- package/dist_ts_migration/004.global-registry.js +30 -8
- package/package.json +2 -2
- package/readme.md +127 -28
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mod_release/helpers.npmpackages.ts +5 -3
- package/ts/mod_services/classes.dockercontainer.ts +58 -50
- package/ts/mod_services/classes.globalregistry.ts +115 -14
- package/ts/mod_services/classes.globalregistrystore.ts +16 -6
- package/ts/mod_services/classes.legacymongomigration.ts +1308 -0
- package/ts/mod_services/classes.serviceconfiguration.ts +64 -40
- package/ts/mod_services/classes.servicedatamarker.ts +149 -8
- package/ts/mod_services/classes.servicemanager.ts +877 -454
- package/ts/mod_services/classes.servicepruner.ts +27 -19
- package/ts/mod_services/index.ts +67 -6
- package/ts/mod_services/mod.plugins.ts +4 -1
- package/ts_migration/002.runtime-config.ts +8 -1
- package/ts_migration/003.service-data-marker.ts +168 -29
- package/ts_migration/004.global-registry.ts +38 -7
|
@@ -2,6 +2,14 @@ import * as plugins from './mod.plugins.js';
|
|
|
2
2
|
import { withInterProcessLock } from './classes.interprocesslock.js';
|
|
3
3
|
export const serviceNames = ['mongodb', 'objectstorage', 'elasticsearch'];
|
|
4
4
|
export const objectStorageImage = 'code.foss.global/lossless.zone/objectstorage@sha256:43b60897eed17b54feb4e363808ce540ed1d9d27201871c5c8a869300d41e1b8';
|
|
5
|
+
/**
|
|
6
|
+
* NoSQLDB engine image serving the `mongodb` service:
|
|
7
|
+
* `code.foss.global/lossless.zone/database` 2.0.0 (@lossless.org/nosqldb
|
|
8
|
+
* 10.7.3), multi-arch index digest for linux/amd64 and linux/arm64.
|
|
9
|
+
*/
|
|
10
|
+
export const noSqlDbImage = 'code.foss.global/lossless.zone/database@sha256:8fed3bc2da051a6ce29906383ea37e3ae777e2a7373869effbd3093fc4a2a650';
|
|
11
|
+
/** The only image older GitZone releases ever ran the `mongodb` service with. */
|
|
12
|
+
export const legacyMongoImage = 'mongo:7.0';
|
|
5
13
|
/** Owner recorded in markers and container labels. */
|
|
6
14
|
export const serviceDataOwner = '@git.zone/cli';
|
|
7
15
|
/** Value of the `git.zone.tool` label on containers created by `gitzone services`. */
|
|
@@ -10,6 +18,7 @@ export const serviceToolLabel = 'gitzone-services';
|
|
|
10
18
|
export const serviceDataMarkerFile = '.gitzone-services.json';
|
|
11
19
|
export const serviceDataMarkerSchemaVersion = 2;
|
|
12
20
|
export const legacyMinioDataDirectoryName = 'miniodata';
|
|
21
|
+
export const legacyMongoDataDirectoryName = 'mongodata';
|
|
13
22
|
export const serviceOperationLabel = 'git.zone.operation';
|
|
14
23
|
export const serviceBindOperation = 'service-bind-operation';
|
|
15
24
|
/**
|
|
@@ -18,7 +27,7 @@ export const serviceBindOperation = 'service-bind-operation';
|
|
|
18
27
|
* refuses to touch anything that does not match it exactly.
|
|
19
28
|
*/
|
|
20
29
|
export const serviceDataDirectoryNames = {
|
|
21
|
-
mongodb: '
|
|
30
|
+
mongodb: 'nosqldbdata',
|
|
22
31
|
objectstorage: 'objectstoragedata',
|
|
23
32
|
elasticsearch: 'esdata',
|
|
24
33
|
};
|
|
@@ -28,7 +37,7 @@ export const serviceDataDirectoryNames = {
|
|
|
28
37
|
* the service ran, so its image is present locally.
|
|
29
38
|
*/
|
|
30
39
|
export const serviceImages = {
|
|
31
|
-
mongodb:
|
|
40
|
+
mongodb: noSqlDbImage,
|
|
32
41
|
objectstorage: objectStorageImage,
|
|
33
42
|
elasticsearch: 'elasticsearch:8.11.0',
|
|
34
43
|
};
|
|
@@ -55,6 +64,16 @@ export const getServiceDataDirectory = (projectPathArg, serviceArg) => {
|
|
|
55
64
|
export const getLegacyMinioDataDirectory = (projectPathArg) => {
|
|
56
65
|
return plugins.path.join(plugins.path.resolve(projectPathArg), '.nogit', legacyMinioDataDirectoryName);
|
|
57
66
|
};
|
|
67
|
+
/** Exact legacy MongoDB (mongod WiredTiger) path, retained as migration evidence. */
|
|
68
|
+
export const getLegacyMongoDataDirectory = (projectPathArg) => {
|
|
69
|
+
return plugins.path.join(plugins.path.resolve(projectPathArg), '.nogit', legacyMongoDataDirectoryName);
|
|
70
|
+
};
|
|
71
|
+
/** Exact legacy data path for a predecessor service. */
|
|
72
|
+
export const getLegacyServiceDataDirectory = (projectPathArg, serviceArg) => {
|
|
73
|
+
return serviceArg === 'minio'
|
|
74
|
+
? getLegacyMinioDataDirectory(projectPathArg)
|
|
75
|
+
: getLegacyMongoDataDirectory(projectPathArg);
|
|
76
|
+
};
|
|
58
77
|
/**
|
|
59
78
|
* True only when `candidatePathArg` is exactly one of the canonical data
|
|
60
79
|
* directories `gitzone services` creates for `projectPathArg`.
|
|
@@ -123,18 +142,19 @@ export const isValidServiceDataMarker = (markerArg) => {
|
|
|
123
142
|
if (!Array.isArray(markerArg.legacyDataDirectories)) {
|
|
124
143
|
return false;
|
|
125
144
|
}
|
|
145
|
+
const seenLegacyServices = new Set();
|
|
126
146
|
for (const entry of markerArg.legacyDataDirectories) {
|
|
127
147
|
if (!isPlainObject(entry) ||
|
|
128
148
|
!hasOnlyKeys(entry, ['service', 'path', 'safeToPrune']) ||
|
|
129
|
-
entry.service !== 'minio' ||
|
|
149
|
+
(entry.service !== 'minio' && entry.service !== 'mongo') ||
|
|
150
|
+
seenLegacyServices.has(entry.service) ||
|
|
130
151
|
entry.safeToPrune !== false ||
|
|
131
152
|
typeof entry.path !== 'string' ||
|
|
132
|
-
plugins.path.resolve(entry.path) !==
|
|
153
|
+
plugins.path.resolve(entry.path) !==
|
|
154
|
+
getLegacyServiceDataDirectory(projectPath, entry.service)) {
|
|
133
155
|
return false;
|
|
134
156
|
}
|
|
135
|
-
|
|
136
|
-
if (markerArg.legacyDataDirectories.length > 1) {
|
|
137
|
-
return false;
|
|
157
|
+
seenLegacyServices.add(entry.service);
|
|
138
158
|
}
|
|
139
159
|
}
|
|
140
160
|
return true;
|
|
@@ -222,6 +242,50 @@ export const recordServiceDataDirectory = async (projectPathArg, serviceArg) =>
|
|
|
222
242
|
await writeServiceDataMarker(projectPath, marker);
|
|
223
243
|
});
|
|
224
244
|
};
|
|
245
|
+
/**
|
|
246
|
+
* Record preserved predecessor data as migration evidence.
|
|
247
|
+
*
|
|
248
|
+
* Legacy entries are always `safeToPrune: false`; no GitZone command ever
|
|
249
|
+
* deletes a path recorded here. An invalid or foreign marker is refused rather
|
|
250
|
+
* than overwritten.
|
|
251
|
+
*/
|
|
252
|
+
export const recordLegacyServiceDataDirectory = async (projectPathArg, serviceArg) => {
|
|
253
|
+
const projectPath = plugins.path.resolve(projectPathArg);
|
|
254
|
+
await withInterProcessLock({
|
|
255
|
+
lockPath: getServiceDataMarkerLockPath(projectPath),
|
|
256
|
+
description: 'Service data marker',
|
|
257
|
+
}, async () => {
|
|
258
|
+
const markerPath = getServiceDataMarkerPath(projectPath);
|
|
259
|
+
const markerExists = await plugins.smartfs.file(markerPath).exists();
|
|
260
|
+
const existingMarker = await readServiceDataMarker(projectPath);
|
|
261
|
+
if (markerExists && !existingMarker) {
|
|
262
|
+
throw new Error(`Refusing to overwrite invalid or foreign service data marker: ${markerPath}`);
|
|
263
|
+
}
|
|
264
|
+
const legacyPath = getLegacyServiceDataDirectory(projectPath, serviceArg);
|
|
265
|
+
if (existingMarker?.legacyDataDirectories?.some((entry) => entry.service === serviceArg && entry.path === legacyPath)) {
|
|
266
|
+
return;
|
|
267
|
+
}
|
|
268
|
+
const legacyEntries = [
|
|
269
|
+
...(existingMarker?.legacyDataDirectories || []).filter((entry) => entry.service !== serviceArg),
|
|
270
|
+
{ service: serviceArg, path: legacyPath, safeToPrune: false },
|
|
271
|
+
].sort((entryA, entryB) => entryA.service.localeCompare(entryB.service));
|
|
272
|
+
await writeServiceDataMarker(projectPath, {
|
|
273
|
+
owner: serviceDataOwner,
|
|
274
|
+
kind: 'service-data',
|
|
275
|
+
schemaVersion: serviceDataMarkerSchemaVersion,
|
|
276
|
+
projectPath,
|
|
277
|
+
safeToPrune: true,
|
|
278
|
+
createdAt: existingMarker?.createdAt || new Date().toISOString(),
|
|
279
|
+
dataDirectories: existingMarker?.dataDirectories || [],
|
|
280
|
+
legacyDataDirectories: legacyEntries,
|
|
281
|
+
});
|
|
282
|
+
});
|
|
283
|
+
};
|
|
284
|
+
/** True when the marker records the exact legacy path as preserved evidence. */
|
|
285
|
+
export const markerRecordsLegacyDataDirectory = (markerArg, projectPathArg, serviceArg) => {
|
|
286
|
+
const expectedPath = getLegacyServiceDataDirectory(projectPathArg, serviceArg);
|
|
287
|
+
return !!markerArg?.legacyDataDirectories?.some((entry) => entry.service === serviceArg && plugins.path.resolve(entry.path) === expectedPath);
|
|
288
|
+
};
|
|
225
289
|
/**
|
|
226
290
|
* Labels applied to every container `gitzone services` creates.
|
|
227
291
|
*
|
|
@@ -254,9 +318,38 @@ export const isLegacyMinioContainerLabels = (labelsArg) => {
|
|
|
254
318
|
return (labelsArg['git.zone.tool'] === serviceToolLabel &&
|
|
255
319
|
labelsArg['git.zone.service'] === 'minio');
|
|
256
320
|
};
|
|
321
|
+
/**
|
|
322
|
+
* A container created by an older GitZone release for the `mongodb` service.
|
|
323
|
+
*
|
|
324
|
+
* Its GitZone labels are exactly the canonical set, except that the data path
|
|
325
|
+
* is the legacy mongod directory. It is migration evidence, never an active
|
|
326
|
+
* NoSQLDB service container and never a prune candidate.
|
|
327
|
+
*/
|
|
328
|
+
export const isLegacyMongoContainerLabels = (labelsArg) => {
|
|
329
|
+
const projectPath = labelsArg['git.zone.project-path'];
|
|
330
|
+
if (labelsArg['git.zone.tool'] !== serviceToolLabel ||
|
|
331
|
+
labelsArg['git.zone.service'] !== 'mongodb' ||
|
|
332
|
+
typeof projectPath !== 'string' ||
|
|
333
|
+
!plugins.path.isAbsolute(projectPath)) {
|
|
334
|
+
return false;
|
|
335
|
+
}
|
|
336
|
+
return hasExactServiceContainerLabels(labelsArg, getLegacyMongoContainerLabels(projectPath));
|
|
337
|
+
};
|
|
338
|
+
/** The exact label envelope older releases put on `<project>-mongodb`. */
|
|
339
|
+
export const getLegacyMongoContainerLabels = (projectPathArg) => {
|
|
340
|
+
return getServiceContainerLabels({
|
|
341
|
+
projectPath: projectPathArg,
|
|
342
|
+
service: 'mongodb',
|
|
343
|
+
dataPath: getLegacyMongoDataDirectory(projectPathArg),
|
|
344
|
+
});
|
|
345
|
+
};
|
|
346
|
+
/** Any predecessor-provider container: preserved evidence, never pruned. */
|
|
347
|
+
export const isLegacyServiceContainerLabels = (labelsArg) => {
|
|
348
|
+
return isLegacyMinioContainerLabels(labelsArg) || isLegacyMongoContainerLabels(labelsArg);
|
|
349
|
+
};
|
|
257
350
|
/** Transient bind-operation containers are owned by their invocation, not by prune. */
|
|
258
351
|
export const isServiceOperationHelperLabels = (labelsArg) => {
|
|
259
352
|
return (labelsArg['git.zone.tool'] === serviceToolLabel &&
|
|
260
353
|
labelsArg[serviceOperationLabel] === serviceBindOperation);
|
|
261
354
|
};
|
|
262
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.servicedatamarker.js","sourceRoot":"","sources":["../../../ts/mod_services/classes.servicedatamarker.ts"],"names":[],"mappings":"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"}
|
|
355
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.servicedatamarker.js","sourceRoot":"","sources":["../../../ts/mod_services/classes.servicedatamarker.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export interface IServiceStatus {
|
|
|
23
23
|
ownership?: 'owned' | 'conflict' | 'absent';
|
|
24
24
|
managementUi?: string;
|
|
25
25
|
}
|
|
26
|
-
export type TServiceManagerOperation = 'auth' | 'clean' | 'compass' | 'config' | 'logs' | 'remove' | 'reconfigure' | 'restart' | 'start' | 'status' | 'stop';
|
|
26
|
+
export type TServiceManagerOperation = 'auth' | 'clean' | 'compass' | 'config' | 'logs' | 'migrate' | 'remove' | 'reconfigure' | 'restart' | 'start' | 'status' | 'stop';
|
|
27
27
|
export declare const getServiceManagerMigrationScopes: (operationArg: TServiceManagerOperation) => TServiceMigrationScope[];
|
|
28
28
|
export interface IServicesStatus {
|
|
29
29
|
project: {
|
|
@@ -40,15 +40,51 @@ export interface IServicesStatus {
|
|
|
40
40
|
minioContainer?: string;
|
|
41
41
|
minioDataDirectory: string;
|
|
42
42
|
minioDataExists: boolean;
|
|
43
|
+
/** Unmigrated legacy mongod container, when one still exists. */
|
|
44
|
+
mongoContainer?: string;
|
|
45
|
+
/** Preserved mongod data; migrated or not, GitZone never deletes it. */
|
|
46
|
+
mongoDataDirectory: string;
|
|
47
|
+
mongoDataExists: boolean;
|
|
48
|
+
/** Migration evidence (dumps, inventories, logs); never deleted by GitZone. */
|
|
49
|
+
mongoMigrationDirectory: string;
|
|
50
|
+
mongoMigrationDirectoryExists: boolean;
|
|
43
51
|
};
|
|
44
52
|
totalDataBytes: number;
|
|
45
53
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
54
|
+
/** Wire-protocol port inside the NoSQLDB container; published as MONGODB_PORT. */
|
|
55
|
+
export declare const noSqlDbWirePort = "27017";
|
|
56
|
+
/** Management UI port inside the container; deliberately never published. */
|
|
57
|
+
export declare const noSqlDbUiPort = "3000";
|
|
58
|
+
/** Numeric `uid:gid` of the image's `database` user; also owns the bind-mounted data. */
|
|
59
|
+
export declare const noSqlDbContainerUser = "999:999";
|
|
60
|
+
export declare const noSqlDbExpectedEntrypoint: string[];
|
|
61
|
+
export declare const noSqlDbExpectedCommand: string[];
|
|
62
|
+
/** The image's own HEALTHCHECK, compared exactly. */
|
|
63
|
+
export declare const noSqlDbExpectedHealthcheck: {
|
|
64
|
+
test: string[];
|
|
65
|
+
interval: number;
|
|
66
|
+
timeout: number;
|
|
67
|
+
startPeriod: number;
|
|
68
|
+
retries: number;
|
|
51
69
|
};
|
|
70
|
+
export declare const noSqlDbReconciliationTimeoutMs = 60000;
|
|
71
|
+
/** The persistence-client surface used to prove NoSQLDB readiness. */
|
|
72
|
+
export interface INoSqlDbReadinessClient {
|
|
73
|
+
init(optionsArg: {
|
|
74
|
+
timeoutMs: number;
|
|
75
|
+
}): Promise<void>;
|
|
76
|
+
checkReadiness(optionsArg: {
|
|
77
|
+
timeoutMs: number;
|
|
78
|
+
}): Promise<{
|
|
79
|
+
ready: true;
|
|
80
|
+
} | {
|
|
81
|
+
ready: false;
|
|
82
|
+
reason: string;
|
|
83
|
+
}>;
|
|
84
|
+
close(optionsArg: {
|
|
85
|
+
timeoutMs: number;
|
|
86
|
+
}): Promise<void>;
|
|
87
|
+
}
|
|
52
88
|
export declare const objectStorageReconciliationTimeoutMs = 30000;
|
|
53
89
|
export interface IObjectStorageReconciliationClock {
|
|
54
90
|
now(): number;
|
|
@@ -83,6 +119,8 @@ export declare class ServiceManager {
|
|
|
83
119
|
private enabledServices;
|
|
84
120
|
private globalRegistry;
|
|
85
121
|
private objectStorageClock;
|
|
122
|
+
private noSqlDbClock;
|
|
123
|
+
private noSqlDbFactory;
|
|
86
124
|
private fetchImplementation;
|
|
87
125
|
private smartBucketFactory;
|
|
88
126
|
constructor();
|
|
@@ -142,50 +180,74 @@ export declare class ServiceManager {
|
|
|
142
180
|
*/
|
|
143
181
|
stopAll(): Promise<void>;
|
|
144
182
|
/**
|
|
145
|
-
* Start MongoDB
|
|
183
|
+
* Start the `mongodb` service: a NoSQLDB engine speaking the MongoDB wire
|
|
184
|
+
* protocol, published on loopback only.
|
|
146
185
|
*
|
|
147
|
-
*
|
|
148
|
-
*
|
|
149
|
-
* MONGODB_PORT inside the container too, so the advertised member address
|
|
150
|
-
* (localhost:MONGODB_PORT) is reachable from host and container alike.
|
|
186
|
+
* Legacy mongod state is migrated first when its ownership is proven, and
|
|
187
|
+
* refused before any Docker mutation when it is not.
|
|
151
188
|
*/
|
|
152
189
|
startMongoDB(): Promise<void>;
|
|
153
190
|
private assertNoPendingDataDeletion;
|
|
154
|
-
private
|
|
191
|
+
private createLegacyMongoMigration;
|
|
192
|
+
private getNoSqlDbExpectedLabels;
|
|
155
193
|
/**
|
|
156
|
-
* Create the
|
|
194
|
+
* Create and start the restore-phase NoSQLDB container of a legacy mongod
|
|
195
|
+
* migration: no network, no published port, restart policy `no`. Only
|
|
196
|
+
* helpers that join its network namespace can reach it, so its data holds
|
|
197
|
+
* nothing but migration writes until verification commits. Refuses to adopt
|
|
198
|
+
* an existing container: the migration restores only into one it created.
|
|
157
199
|
*/
|
|
158
|
-
private
|
|
200
|
+
private startMigrationNoSqlDbContainer;
|
|
201
|
+
/** Inspect the canonical NoSQLDB container and prove it is the restore-phase shape. */
|
|
202
|
+
private inspectMigrationNoSqlDbContainer;
|
|
203
|
+
/** Gracefully stop the restore-phase container so its data is flushed. */
|
|
204
|
+
private stopMigrationNoSqlDbContainer;
|
|
159
205
|
/**
|
|
160
|
-
*
|
|
161
|
-
*
|
|
162
|
-
*
|
|
206
|
+
* Replace the stopped restore-phase container with the published service
|
|
207
|
+
* container on the same data directory and wait until it is ready.
|
|
208
|
+
* Idempotent: once the service container exists it is only reconciled.
|
|
163
209
|
*/
|
|
164
|
-
private
|
|
210
|
+
private publishMigratedNoSqlDbContainer;
|
|
211
|
+
private startMongoDBLocked;
|
|
212
|
+
/** Read-only preflight used before restart or reconfigure may stop anything. */
|
|
213
|
+
assertMongoStartupAllowed(): Promise<void>;
|
|
214
|
+
private assertNoSqlDbConfigurationSafe;
|
|
215
|
+
private getNoSqlDbEnvironment;
|
|
165
216
|
/**
|
|
166
|
-
*
|
|
167
|
-
*
|
|
168
|
-
* `
|
|
169
|
-
*
|
|
170
|
-
*
|
|
171
|
-
* the designed bootstrap path for exactly this: while zero users exist, a
|
|
172
|
-
* connection from localhost — which, inside the container, is what this is —
|
|
173
|
-
* may create the first one. If users already exist the exception does not
|
|
174
|
-
* apply and creation fails, so this can never overwrite or escalate anything.
|
|
217
|
+
* Whether a NoSQLDB container has exactly the runtime configuration of one
|
|
218
|
+
* lifecycle shape. `service` is the published, auto-restarting service;
|
|
219
|
+
* `migration` is the restore-phase container of a legacy mongod migration:
|
|
220
|
+
* no network, no published port, restart policy `no`, so no application can
|
|
221
|
+
* reach or revive it before its data is verified.
|
|
175
222
|
*/
|
|
176
|
-
private
|
|
223
|
+
private noSqlDbConfigurationMatches;
|
|
224
|
+
private inspectNoSqlDbContainer;
|
|
225
|
+
private revalidateNoSqlDbContainer;
|
|
226
|
+
private prepareNoSqlDbDataDirectory;
|
|
227
|
+
private createNoSqlDbContainer;
|
|
228
|
+
/** Authenticated wire-protocol readiness through the persistence client. */
|
|
229
|
+
private waitForNoSqlDbReadiness;
|
|
177
230
|
/**
|
|
178
|
-
*
|
|
231
|
+
* Create, start, or reconcile the canonical NoSQLDB container by immutable id
|
|
232
|
+
* and wait until it answers authenticated requests. Containers started by
|
|
233
|
+
* this invocation are stopped again when reconciliation fails.
|
|
179
234
|
*/
|
|
180
|
-
private
|
|
235
|
+
private reconcileNoSqlDbContainer;
|
|
181
236
|
private inspectObjectStorageContainer;
|
|
182
|
-
private
|
|
237
|
+
private inspectManagedContainerIdentity;
|
|
183
238
|
private discoverContainerIdByExactName;
|
|
184
239
|
private assertObjectStorageOwnership;
|
|
185
240
|
private revalidateObjectStorageContainer;
|
|
186
241
|
private objectStorageConfigurationMatches;
|
|
187
|
-
private
|
|
242
|
+
private assertNoSymlinkedServiceDataPath;
|
|
243
|
+
/**
|
|
244
|
+
* Create or prove the canonical data directory, then hand it to the image's
|
|
245
|
+
* service user with private permissions through one fenced root operation.
|
|
246
|
+
*/
|
|
247
|
+
private prepareHardenedDataDirectory;
|
|
188
248
|
private prepareObjectStorageDataDirectory;
|
|
249
|
+
/** An exactly owned container proves its canonical data directory. */
|
|
250
|
+
private repairServiceMarkerFromOwnedContainer;
|
|
189
251
|
private repairObjectStorageMarkerFromOwnedContainer;
|
|
190
252
|
private assertNoLegacyMinioResources;
|
|
191
253
|
/** Read-only preflight used before restart or reconfigure may stop anything. */
|
|
@@ -206,6 +268,8 @@ export declare class ServiceManager {
|
|
|
206
268
|
*/
|
|
207
269
|
stopMongoDB(): Promise<void>;
|
|
208
270
|
private stopMongoDBLocked;
|
|
271
|
+
/** Stop a proven-owned, unmigrated legacy mongod container by immutable id. */
|
|
272
|
+
private stopLegacyMongoContainer;
|
|
209
273
|
/** Stop only an exactly owned canonical ObjectStorage container. */
|
|
210
274
|
stopObjectStorage(): Promise<void>;
|
|
211
275
|
private stopObjectStorageLocked;
|
|
@@ -221,6 +285,8 @@ export declare class ServiceManager {
|
|
|
221
285
|
* --json`; consumers such as test suites can read a connection string from it
|
|
222
286
|
* without scraping human output or re-deriving it from `.nogit/env.json`.
|
|
223
287
|
*/
|
|
288
|
+
/** Status of a label-owned service container, resolved by immutable id. */
|
|
289
|
+
private describeManagedContainer;
|
|
224
290
|
collectStatus(): Promise<IServicesStatus>;
|
|
225
291
|
/**
|
|
226
292
|
* Show service status
|
|
@@ -238,7 +304,7 @@ export declare class ServiceManager {
|
|
|
238
304
|
*/
|
|
239
305
|
showConfig(): Promise<void>;
|
|
240
306
|
/**
|
|
241
|
-
* Show MongoDB Compass connection string
|
|
307
|
+
* Show a MongoDB Compass connection string for the NoSQLDB service.
|
|
242
308
|
*/
|
|
243
309
|
showCompassConnection(): Promise<void>;
|
|
244
310
|
/**
|