@balena/open-balena-api 31.2.6-build-fix-creating-only-relevant-service-install-d8f6c8085f055ae8051b01a119682dfb617ee56f-1 → 31.2.6-build-service-install-filter-gc-c9e2c19bf3b53416385d9a272cb34f7d351d1b32-1
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { tasks, sbvrUtils, permissions } from '@balena/pinejs';
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
import { ASYNC_TASK_ATTEMPT_LIMIT, ASYNC_TASK_CREATE_SERVICE_INSTALLS_MAX_TIME_MS, } from '../../../lib/config.js';
|
|
4
|
-
import { ThisShouldNeverHappenError } from '../../../infra/error-handling/index.js';
|
|
5
4
|
const schema = {
|
|
6
5
|
type: 'object',
|
|
7
6
|
properties: {
|
|
@@ -44,7 +43,7 @@ const createServiceInstalls = async ({ devices, }) => {
|
|
|
44
43
|
},
|
|
45
44
|
},
|
|
46
45
|
};
|
|
47
|
-
const
|
|
46
|
+
const deviceWithServices = await api.resin.get({
|
|
48
47
|
resource: 'device',
|
|
49
48
|
passthrough: { req: permissions.rootRead },
|
|
50
49
|
options: {
|
|
@@ -58,63 +57,65 @@ const createServiceInstalls = async ({ devices, }) => {
|
|
|
58
57
|
id: { $in: devices },
|
|
59
58
|
},
|
|
60
59
|
},
|
|
61
|
-
})
|
|
62
|
-
|
|
60
|
+
});
|
|
61
|
+
const serviceIds = [
|
|
62
|
+
...new Set(deviceWithServices.flatMap((device) => [
|
|
63
63
|
...device.should_be_running__release,
|
|
64
64
|
...device.should_be_managed_by__release,
|
|
65
65
|
...device.should_be_operated_by__release,
|
|
66
|
-
].flatMap((release) => release.contains__image.flatMap((image) => image.image.map((img) => img.is_a_build_of__service.__id)))
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
const serviceIds = [...new Set([...targetServicesByDevice.values()].flat())];
|
|
70
|
-
const missingServiceFilters = serviceIds.map((serviceId) => ({
|
|
71
|
-
$not: {
|
|
72
|
-
service_install: {
|
|
73
|
-
$any: {
|
|
74
|
-
$alias: 'si',
|
|
75
|
-
$expr: {
|
|
76
|
-
si: {
|
|
77
|
-
installs__service: serviceId,
|
|
78
|
-
},
|
|
79
|
-
},
|
|
80
|
-
},
|
|
81
|
-
},
|
|
82
|
-
},
|
|
83
|
-
}));
|
|
84
|
-
if (missingServiceFilters.length === 0) {
|
|
66
|
+
].flatMap((release) => release.contains__image.flatMap((image) => image.image.map((img) => img.is_a_build_of__service.__id))))),
|
|
67
|
+
];
|
|
68
|
+
if (serviceIds.length === 0) {
|
|
85
69
|
console.info('[service-install-task] No service installs to create');
|
|
86
70
|
return 0;
|
|
87
71
|
}
|
|
88
|
-
const devicesToAddServiceInstalls =
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
$select: 'id',
|
|
93
|
-
$expand: {
|
|
72
|
+
const devicesToAddServiceInstalls = await (async () => {
|
|
73
|
+
// Creating the filters inside an iife so that they get GCed right after the query.
|
|
74
|
+
const missingServiceFilters = serviceIds.map((serviceId) => ({
|
|
75
|
+
$not: {
|
|
94
76
|
service_install: {
|
|
95
|
-
$
|
|
96
|
-
|
|
97
|
-
|
|
77
|
+
$any: {
|
|
78
|
+
$alias: 'si',
|
|
79
|
+
$expr: {
|
|
80
|
+
si: {
|
|
81
|
+
installs__service: serviceId,
|
|
82
|
+
},
|
|
83
|
+
},
|
|
98
84
|
},
|
|
99
85
|
},
|
|
100
86
|
},
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
87
|
+
}));
|
|
88
|
+
return (await api.resin.get({
|
|
89
|
+
resource: 'device',
|
|
90
|
+
passthrough: { req: permissions.rootRead },
|
|
91
|
+
options: {
|
|
92
|
+
$select: 'id',
|
|
93
|
+
$expand: {
|
|
94
|
+
service_install: {
|
|
95
|
+
$select: 'installs__service',
|
|
96
|
+
$filter: {
|
|
97
|
+
installs__service: { $in: serviceIds },
|
|
98
|
+
},
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
$filter: {
|
|
102
|
+
id: { $in: devices },
|
|
103
|
+
...(missingServiceFilters.length === 1
|
|
104
|
+
? missingServiceFilters[0]
|
|
105
|
+
: {
|
|
106
|
+
$or: missingServiceFilters,
|
|
107
|
+
}),
|
|
108
|
+
},
|
|
108
109
|
},
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
};
|
|
117
|
-
});
|
|
110
|
+
})).map((device) => {
|
|
111
|
+
// Transform the device to the simpler object we will need later which is smaller
|
|
112
|
+
// and will allow the larger version to be garbage collected sooner
|
|
113
|
+
return {
|
|
114
|
+
id: device.id,
|
|
115
|
+
serviceInstalls: device.service_install.map((si) => si.installs__service.__id),
|
|
116
|
+
};
|
|
117
|
+
});
|
|
118
|
+
})();
|
|
118
119
|
// This is already batched at one level, does it make sense to batch it again?
|
|
119
120
|
const remainingDevices = new Set(devices);
|
|
120
121
|
let totalSiCreated = 0;
|
|
@@ -136,31 +137,23 @@ const createServiceInstalls = async ({ devices, }) => {
|
|
|
136
137
|
console.info('[service-install-task] Task took too long. Created a new task for the remaining devices');
|
|
137
138
|
return totalSiCreated;
|
|
138
139
|
}
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
installs__service: serviceId,
|
|
156
|
-
},
|
|
157
|
-
options: { returnResource: false },
|
|
158
|
-
});
|
|
159
|
-
}));
|
|
160
|
-
totalSiCreated += deviceServiceIds.length;
|
|
161
|
-
}
|
|
140
|
+
// Use existingServiceIds as a Set for faster lookups on the follow up filter
|
|
141
|
+
const existingServiceIds = device.serviceInstalls;
|
|
142
|
+
const deviceServiceIds = _.difference(serviceIds, existingServiceIds);
|
|
143
|
+
await Promise.all(deviceServiceIds.map(async (serviceId) => {
|
|
144
|
+
// Create a service_install for this pair of service and device
|
|
145
|
+
await api.resin.post({
|
|
146
|
+
resource: 'service_install',
|
|
147
|
+
passthrough: { req: permissions.root, tx },
|
|
148
|
+
body: {
|
|
149
|
+
device: device.id,
|
|
150
|
+
installs__service: serviceId,
|
|
151
|
+
},
|
|
152
|
+
options: { returnResource: false },
|
|
153
|
+
});
|
|
154
|
+
}));
|
|
155
|
+
totalSiCreated += deviceServiceIds.length;
|
|
162
156
|
remainingDevices.delete(device.id);
|
|
163
|
-
targetServicesByDevice.delete(device.id);
|
|
164
157
|
}
|
|
165
158
|
return totalSiCreated;
|
|
166
159
|
});
|
|
@@ -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;
|
|
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.6-build-
|
|
4
|
+
"version": "31.2.6-build-service-install-filter-gc-c9e2c19bf3b53416385d9a272cb34f7d351d1b32-1",
|
|
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-19T14:
|
|
169
|
+
"publishedAt": "2024-11-19T14:45:10.595Z"
|
|
170
170
|
}
|
|
171
171
|
}
|