@lage-run/scheduler 0.7.2 → 0.7.3

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "@lage-run/scheduler",
   "entries": [
     {
-      "date": "Thu, 08 Dec 2022 00:49:16 GMT",
+      "date": "Thu, 05 Jan 2023 00:40:39 GMT",
+      "tag": "@lage-run/scheduler_v0.7.3",
+      "version": "0.7.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/scheduler",
+            "commit": "961843bef658c51312e02498554ad338e467e1a7",
+            "comment": "fixing progress bar to not be a bottleneck"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 08 Dec 2022 00:49:28 GMT",
       "tag": "@lage-run/scheduler_v0.7.2",
       "version": "0.7.2",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - @lage-run/scheduler
 
-This log was last generated on Thu, 08 Dec 2022 00:49:16 GMT and should not be manually modified.
+This log was last generated on Thu, 05 Jan 2023 00:40:39 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.7.3
+
+Thu, 05 Jan 2023 00:40:39 GMT
+
+### Patches
+
+- fixing progress bar to not be a bottleneck (kchau@microsoft.com)
+
 ## 0.7.2
 
-Thu, 08 Dec 2022 00:49:16 GMT
+Thu, 08 Dec 2022 00:49:28 GMT
 
 ### Patches
 

package/lib/SimpleScheduler.d.ts

@@ -40,7 +40,6 @@ 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

@@ -220,13 +220,10 @@ 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 {
@@ -248,8 +245,6 @@ 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.d.ts

@@ -43,7 +43,7 @@ export declare class WrappedTarget implements TargetRun {
     constructor(options: WrappedTargetOptions);
     onQueued(): void;
     onAbort(): void;
-    onStart(): void;
+    onStart(threadId: number): void;
     onComplete(): void;
     onFail(): void;
     onSkipped(hash: string | null): void;

package/lib/WrappedTarget.js

@@ -37,27 +37,27 @@ class WrappedTarget {
     onAbort() {
         this.status = "aborted";
         this.duration = process.hrtime(this.startTime);
-        this.options.logger.info("aborted", {
+        this.options.logger.info("", {
             target: this.target,
             status: "aborted",
             threadId: this.threadId
         });
     }
-    onStart() {
+    onStart(threadId) {
         if (this.status !== "running") {
             this.status = "running";
             this.startTime = process.hrtime();
-            this.options.logger.info("running", {
+            this.options.logger.info("", {
                 target: this.target,
                 status: "running",
-                threadId: this.threadId
+                threadId
             });
         }
     }
     onComplete() {
         this.status = "success";
         this.duration = process.hrtime(this.startTime);
-        this.options.logger.info("success", {
+        this.options.logger.info("", {
             target: this.target,
             status: "success",
             duration: this.duration,
@@ -67,7 +67,7 @@ class WrappedTarget {
     onFail() {
         this.status = "failed";
         this.duration = process.hrtime(this.startTime);
-        this.options.logger.info("failed", {
+        this.options.logger.info("", {
             target: this.target,
             status: "failed",
             duration: this.duration,
@@ -80,7 +80,7 @@ class WrappedTarget {
     onSkipped(hash) {
         this.status = "skipped";
         this.duration = process.hrtime(this.startTime);
-        this.options.logger.info(`skipped`, {
+        this.options.logger.info("", {
             target: this.target,
             status: "skipped",
             duration: this.duration,
@@ -123,7 +123,7 @@ class WrappedTarget {
         this.onQueued();
         const abortSignal = abortController.signal;
         if (abortSignal.aborted) {
-            this.onStart();
+            this.onStart(0);
             this.onAbort();
             return;
         }
@@ -135,7 +135,7 @@ class WrappedTarget {
                 logger.verbose(`hash: ${hash}, cache hit? ${cacheHit}`, {
                     target
                 });
-                this.onStart();
+                this.onStart(0);
                 const cachedOutputFile = (0, _getLageOutputCacheLocationJs.getLageOutputCacheLocation)(this.target, hash ?? "");
                 if (_fs.default.existsSync(cachedOutputFile)) {
                     const cachedOutput = _fs.default.createReadStream(cachedOutputFile, "utf8");
@@ -192,13 +192,14 @@ class WrappedTarget {
         const bufferStderr = (0, _bufferTransformJs.bufferTransform)();
         this.result = pool.exec({
             target
-        }, target.weight ?? 1, (_worker, stdout, stderr)=>{
-            this.onStart();
+        }, target.weight ?? 1, (worker, stdout, stderr)=>{
+            const threadId = worker.threadId;
+            this.onStart(threadId);
             stdout.pipe(bufferStdout.transform);
             stderr.pipe(bufferStderr.transform);
             const releaseStdoutStream = logger.stream(_logger.LogLevel.verbose, stdout, {
                 target,
-                threadId: this.threadId
+                threadId
             });
             releaseStdout = ()=>{
                 releaseStdoutStream();
@@ -206,7 +207,7 @@ class WrappedTarget {
             };
             const releaseStderrStream = logger.stream(_logger.LogLevel.verbose, stderr, {
                 target,
-                threadId: this.threadId
+                threadId
             });
             releaseStderr = ()=>{
                 releaseStderrStream();

package/package.json

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