@balena/open-balena-api 31.2.10-build-service-install-task-write-tx-03dec042707480b4af9ba29641165b625dedbce5-1 → 31.2.10
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -29,11 +29,8 @@ tasks.addTaskHandler('create_service_installs', async (options) => {
|
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
}, schema);
|
|
32
|
-
async
|
|
33
|
-
|
|
34
|
-
// replication lag can cause, in which case we read stale data.
|
|
35
|
-
// Eg moving a device could lead to recreating the same service installs.
|
|
36
|
-
// TODO: Consider artificially delaying the task from running as an alternative.
|
|
32
|
+
const createServiceInstalls = async ({ devices, }) => {
|
|
33
|
+
const startTime = Date.now();
|
|
37
34
|
return await sbvrUtils.db.transaction(async (tx) => {
|
|
38
35
|
const releaseExpand = {
|
|
39
36
|
$select: 'id',
|
|
@@ -48,6 +45,12 @@ async function getTargetDevicesAndServices(devices) {
|
|
|
48
45
|
},
|
|
49
46
|
},
|
|
50
47
|
};
|
|
48
|
+
// We use a write transaction to avoid a race condition that a high
|
|
49
|
+
// replication lag can cause, in which case we read stale data.
|
|
50
|
+
// Eg: moving a device could lead to recreating the same service installs.
|
|
51
|
+
// TODO: Once the API no longer uses the service installs at all,
|
|
52
|
+
// consider artificially delaying the task's start, and using a read
|
|
53
|
+
// transaction for the get() calls.
|
|
51
54
|
const targetServicesByDevice = new Map((await api.resin.get({
|
|
52
55
|
resource: 'device',
|
|
53
56
|
passthrough: { req: permissions.rootRead, tx },
|
|
@@ -75,7 +78,7 @@ async function getTargetDevicesAndServices(devices) {
|
|
|
75
78
|
];
|
|
76
79
|
if (serviceIds.length === 0) {
|
|
77
80
|
console.info('[service-install-task] No service installs to create');
|
|
78
|
-
return;
|
|
81
|
+
return 0;
|
|
79
82
|
}
|
|
80
83
|
const missingServiceFilters = serviceIds.map((serviceId) => ({
|
|
81
84
|
$not: {
|
|
@@ -121,20 +124,9 @@ async function getTargetDevicesAndServices(devices) {
|
|
|
121
124
|
serviceInstalls: device.service_install.map((si) => si.installs__service.__id),
|
|
122
125
|
};
|
|
123
126
|
});
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
const createServiceInstalls = async ({ devices, }) => {
|
|
128
|
-
const startTime = Date.now();
|
|
129
|
-
const deviceAndServiceInfo = await getTargetDevicesAndServices(devices);
|
|
130
|
-
if (deviceAndServiceInfo == null) {
|
|
131
|
-
return 0;
|
|
132
|
-
}
|
|
133
|
-
const { targetServicesByDevice, devicesToAddServiceInstalls } = deviceAndServiceInfo;
|
|
134
|
-
// This is already batched at one level, does it make sense to batch it again?
|
|
135
|
-
const remainingDevices = new Set(devices);
|
|
136
|
-
let totalSiCreated = 0;
|
|
137
|
-
return await sbvrUtils.db.transaction(async (tx) => {
|
|
127
|
+
// This is already batched at one level, does it make sense to batch it again?
|
|
128
|
+
const remainingDevices = new Set(devices);
|
|
129
|
+
let totalSiCreated = 0;
|
|
138
130
|
for (const device of devicesToAddServiceInstalls) {
|
|
139
131
|
if (Date.now() - startTime >
|
|
140
132
|
ASYNC_TASK_CREATE_SERVICE_INSTALLS_MAX_TIME_MS) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-installs.js","sourceRoot":"","sources":["../../../../src/features/ci-cd/tasks/service-installs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EACN,wBAAwB,EACxB,8CAA8C,GAC9C,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AAEpF,MAAM,MAAM,GAAG;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACX,OAAO,EAAE;YACR,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACzB;KACD;IACD,QAAQ,EAAE,CAAC,SAAS,CAAC;CACrB,CAAC;AAEF,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;AAM1B,KAAK,CAAC,cAAc,CACnB,yBAAyB,EACzB,KAAK,EAAE,OAAO,EAAE,EAAE;IACjB,IAAI,CAAC;QACJ,MAAM,cAAc,GAAG,MAAM,qBAAqB,CACjD,OAAO,CAAC,MAAyC,CACjD,CAAC;QACF,OAAO,CAAC,IAAI,CACX,kCAAkC,cAAc,mBAAmB,CACnE,CAAC;QACF,OAAO;YACN,MAAM,EAAE,WAAW;SACnB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,OAAO,CAAC,KAAK,CACZ,2DAA2D,CAAC,EAAE,CAC9D,CAAC;QACF,OAAO;YACN,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,MAAM,EAAE,QAAQ;SAChB,CAAC;IACH,CAAC;AACF,CAAC,EACD,MAAM,CACN,CAAC;AAEF,KAAK,
|
|
1
|
+
{"version":3,"file":"service-installs.js","sourceRoot":"","sources":["../../../../src/features/ci-cd/tasks/service-installs.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/open-balena-api",
|
|
3
3
|
"description": "Internet of things, Made Simple",
|
|
4
|
-
"version": "31.2.10
|
|
4
|
+
"version": "31.2.10",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -166,6 +166,6 @@
|
|
|
166
166
|
"loader": "ts-node/esm/transpile-only"
|
|
167
167
|
},
|
|
168
168
|
"versionist": {
|
|
169
|
-
"publishedAt": "2024-11-
|
|
169
|
+
"publishedAt": "2024-11-22T14:11:16.869Z"
|
|
170
170
|
}
|
|
171
171
|
}
|