@lage-run/scheduler 0.4.11 → 0.4.12
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/CHANGELOG.json +28 -1
- package/CHANGELOG.md +12 -2
- package/lib/SimpleScheduler.js +7 -6
- package/lib/SimpleScheduler.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,34 @@
|
|
|
2
2
|
"name": "@lage-run/scheduler",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "Fri, 21 Oct 2022
|
|
5
|
+
"date": "Fri, 21 Oct 2022 21:36:26 GMT",
|
|
6
|
+
"tag": "@lage-run/scheduler_v0.4.12",
|
|
7
|
+
"version": "0.4.12",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "ken@gizzar.com",
|
|
12
|
+
"package": "@lage-run/scheduler",
|
|
13
|
+
"commit": "735930e09c2fdf476c3f2c56c1c05062401097b8",
|
|
14
|
+
"comment": "uses new AggregatePool"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@lage-run/scheduler",
|
|
19
|
+
"comment": "Bump @lage-run/worker-threads-pool to v0.2.0",
|
|
20
|
+
"commit": "735930e09c2fdf476c3f2c56c1c05062401097b8"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"author": "beachball",
|
|
24
|
+
"package": "@lage-run/scheduler",
|
|
25
|
+
"comment": "Bump @lage-run/scheduler-types to v0.1.12",
|
|
26
|
+
"commit": "735930e09c2fdf476c3f2c56c1c05062401097b8"
|
|
27
|
+
}
|
|
28
|
+
]
|
|
29
|
+
}
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
"date": "Fri, 21 Oct 2022 19:33:09 GMT",
|
|
6
33
|
"tag": "@lage-run/scheduler_v0.4.11",
|
|
7
34
|
"version": "0.4.11",
|
|
8
35
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,22 @@
|
|
|
1
1
|
# Change Log - @lage-run/scheduler
|
|
2
2
|
|
|
3
|
-
This log was last generated on Fri, 21 Oct 2022
|
|
3
|
+
This log was last generated on Fri, 21 Oct 2022 21:36:26 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.4.12
|
|
8
|
+
|
|
9
|
+
Fri, 21 Oct 2022 21:36:26 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- uses new AggregatePool (ken@gizzar.com)
|
|
14
|
+
- Bump @lage-run/worker-threads-pool to v0.2.0
|
|
15
|
+
- Bump @lage-run/scheduler-types to v0.1.12
|
|
16
|
+
|
|
7
17
|
## 0.4.11
|
|
8
18
|
|
|
9
|
-
Fri, 21 Oct 2022 19:
|
|
19
|
+
Fri, 21 Oct 2022 19:33:09 GMT
|
|
10
20
|
|
|
11
21
|
### Patches
|
|
12
22
|
|
package/lib/SimpleScheduler.js
CHANGED
|
@@ -29,7 +29,10 @@ class SimpleScheduler {
|
|
|
29
29
|
this.dependencies = [];
|
|
30
30
|
this.runPromise = Promise.resolve();
|
|
31
31
|
this.pool =
|
|
32
|
-
(_a = options.pool) !== null && _a !== void 0 ? _a : new worker_threads_pool_1.
|
|
32
|
+
(_a = options.pool) !== null && _a !== void 0 ? _a : new worker_threads_pool_1.AggregatedPool({
|
|
33
|
+
logger: options.logger,
|
|
34
|
+
maxWorkersByGroup: options.maxWorkersPerTask,
|
|
35
|
+
groupBy: ({ target }) => target.task,
|
|
33
36
|
maxWorkers: options.concurrency,
|
|
34
37
|
script: require.resolve("./workers/targetWorker"),
|
|
35
38
|
workerOptions: {
|
|
@@ -133,8 +136,7 @@ class SimpleScheduler {
|
|
|
133
136
|
this.runPromise = this.scheduleReadyTargets();
|
|
134
137
|
}
|
|
135
138
|
getReadyTargets() {
|
|
136
|
-
var _a
|
|
137
|
-
const { maxWorkersPerTask, concurrency } = this.options;
|
|
139
|
+
var _a;
|
|
138
140
|
const readyTargets = [];
|
|
139
141
|
const runningTargets = this.targetsByPriority.filter((target) => this.targetRuns.get(target.id).status === "running");
|
|
140
142
|
const runningTargetsCountByTask = {};
|
|
@@ -153,10 +155,9 @@ class SimpleScheduler {
|
|
|
153
155
|
const fromTarget = this.targetRuns.get(dep);
|
|
154
156
|
return fromTarget.status === "success" || fromTarget.status === "skipped" || dep === (0, target_graph_1.getStartTargetId)();
|
|
155
157
|
});
|
|
156
|
-
|
|
157
|
-
if (ready && targetRun.status === "pending" && ((_b = runningTargetsCountByTask[target.task]) !== null && _b !== void 0 ? _b : 0) < maxWorkers) {
|
|
158
|
+
if (ready && targetRun.status === "pending") {
|
|
158
159
|
readyTargets.push(targetRun);
|
|
159
|
-
runningTargetsCountByTask[target.task] = ((
|
|
160
|
+
runningTargetsCountByTask[target.task] = ((_a = runningTargetsCountByTask[target.task]) !== null && _a !== void 0 ? _a : 0) + 1;
|
|
160
161
|
}
|
|
161
162
|
}
|
|
162
163
|
return readyTargets;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleScheduler.js","sourceRoot":"","sources":["../src/SimpleScheduler.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,iEAA8D;AAC9D,yDAAiF;AACjF,mDAAgD;
|
|
1
|
+
{"version":3,"file":"SimpleScheduler.js","sourceRoot":"","sources":["../src/SimpleScheduler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lage-run/scheduler",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.12",
|
|
4
4
|
"description": "Scheduler for Lage",
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "https://github.com/microsoft/lage"
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"@lage-run/target-graph": "^0.4.3",
|
|
19
19
|
"@lage-run/logger": "^1.2.0",
|
|
20
20
|
"@lage-run/cache": "^0.1.20",
|
|
21
|
-
"@lage-run/worker-threads-pool": "^0.
|
|
21
|
+
"@lage-run/worker-threads-pool": "^0.2.0",
|
|
22
22
|
"@lage-run/format-hrtime": "^0.1.1",
|
|
23
23
|
"p-graph": "^1.1.1",
|
|
24
24
|
"p-profiler": "^0.2.1",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"workspace-tools": "^0.28.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@lage-run/scheduler-types": "^0.1.
|
|
29
|
+
"@lage-run/scheduler-types": "^0.1.12",
|
|
30
30
|
"@lage-run/monorepo-fixture": "*",
|
|
31
31
|
"@types/workerpool": "6.1.0",
|
|
32
32
|
"monorepo-scripts": "*"
|