@lage-run/scheduler 0.7.1 → 0.7.2

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "@lage-run/scheduler",
   "entries": [
     {
-      "date": "Tue, 06 Dec 2022 00:47:50 GMT",
+      "date": "Thu, 08 Dec 2022 00:49:16 GMT",
+      "tag": "@lage-run/scheduler_v0.7.2",
+      "version": "0.7.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/scheduler",
+            "commit": "ad281dfe8b222d949130821828a680d1c3625154",
+            "comment": "sets the default to progress"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 06 Dec 2022 00:48:02 GMT",
       "tag": "@lage-run/scheduler_v0.7.1",
       "version": "0.7.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - @lage-run/scheduler
 
-This log was last generated on Tue, 06 Dec 2022 00:47:50 GMT and should not be manually modified.
+This log was last generated on Thu, 08 Dec 2022 00:49:16 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.7.2
+
+Thu, 08 Dec 2022 00:49:16 GMT
+
+### Patches
+
+- sets the default to progress (kchau@microsoft.com)
+
 ## 0.7.1
 
-Tue, 06 Dec 2022 00:47:50 GMT
+Tue, 06 Dec 2022 00:48:02 GMT
 
 ### Patches
 

package/lib/SimpleScheduler.d.ts

@@ -40,6 +40,7 @@ export declare class SimpleScheduler implements TargetScheduler {
     abortController: AbortController;
     abortSignal: AbortSignal;
     pool: Pool;
+    workerIds: number[];
     runPromise: Promise<any>;
     constructor(options: SimpleSchedulerOptions);
     getTargetsByPriority(): import("@lage-run/target-graph").Target[];

package/lib/SimpleScheduler.js

@@ -45,6 +45,11 @@ class SimpleScheduler {
    */ async run(root, targetGraph, shouldRerun = false) {
         const startTime = process.hrtime();
         const { continueOnError , logger , cacheProvider , shouldCache , shouldResetCache , hasher  } = this.options;
+        logger.verbose("", {
+            schedulerRun: {
+                startTime
+            }
+        });
         const { pool , abortController  } = this;
         const { targets  } = targetGraph;
         for (const target of targets.values()){
@@ -175,6 +180,7 @@ class SimpleScheduler {
             ...this.targetRuns.values()
         ].filter((t)=>!t.target.hidden).length;
         this.options.logger.verbose("", {
+            poolStats: this.pool.stats(),
             progress: {
                 waiting: targetRunByStatus.pending.length + targetRunByStatus.queued.length,
                 completed: targetRunByStatus.aborted.length + targetRunByStatus.failed.length + targetRunByStatus.skipped.length + targetRunByStatus.success.length,
@@ -214,10 +220,13 @@ class SimpleScheduler {
             },
             workerIdleMemoryLimit: options.workerIdleMemoryLimit
         });
+        this.workerIds = Array(options.concurrency).fill(0).map((_, idx)=>idx + 1);
     }
 }
 async function generateTargetRunPromise(target) {
     let runError;
+    const threadId = this.workerIds.shift();
+    target.threadId = threadId;
     if (target.result && target.successful && !this.rerunTargets.has(target.target.id)) {
         await target.result;
     } else {
@@ -239,6 +248,8 @@ async function generateTargetRunPromise(target) {
             }
         }
     }
+    this.workerIds.unshift(threadId);
+    this.workerIds.sort();
     this.logProgress();
     // finally do another round of scheduling to run next round of targets
     await this.scheduleReadyTargets();

package/lib/WrappedTarget.js

@@ -192,8 +192,7 @@ class WrappedTarget {
         const bufferStderr = (0, _bufferTransformJs.bufferTransform)();
         this.result = pool.exec({
             target
-        }, target.weight ?? 1, (worker, stdout, stderr)=>{
-            this.threadId = worker.threadId;
+        }, target.weight ?? 1, (_worker, stdout, stderr)=>{
             this.onStart();
             stdout.pipe(bufferStdout.transform);
             stderr.pipe(bufferStderr.transform);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/scheduler",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Scheduler for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"