@lage-run/scheduler 0.7.0 → 0.7.2

package/CHANGELOG.json

@@ -2,7 +2,43 @@
   "name": "@lage-run/scheduler",
   "entries": [
     {
-      "date": "Mon, 05 Dec 2022 18:02:26 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": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/scheduler",
+            "commit": "3fa4b9c8aa67cbc2198385e32fa38de123541f09",
+            "comment": "creating the beginnings of a progress reporter - it's in beta"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/scheduler",
+            "comment": "Bump @lage-run/scheduler-types to v0.2.10",
+            "commit": "3fa4b9c8aa67cbc2198385e32fa38de123541f09"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 05 Dec 2022 18:02:35 GMT",
       "tag": "@lage-run/scheduler_v0.7.0",
       "version": "0.7.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,29 @@
 # Change Log - @lage-run/scheduler
 
-This log was last generated on Mon, 05 Dec 2022 18:02:26 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:48:02 GMT
+
+### Patches
+
+- creating the beginnings of a progress reporter - it's in beta (kchau@microsoft.com)
+- Bump @lage-run/scheduler-types to v0.2.10
+
 ## 0.7.0
 
-Mon, 05 Dec 2022 18:02:26 GMT
+Mon, 05 Dec 2022 18:02:35 GMT
 
 ### Minor changes
 

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[];
@@ -62,6 +63,7 @@ export declare class SimpleScheduler implements TargetScheduler {
     getReadyTargets(): WrappedTarget[];
     isAllDone(): boolean;
     scheduleReadyTargets(): Promise<void>;
+    logProgress(): void;
     cleanup(): Promise<void>;
     /**
      * Abort the scheduler using the abort controller.

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()){
@@ -93,9 +98,7 @@ class SimpleScheduler {
             error = e instanceof Error ? e.message : String(e);
         } finally{
             duration = process.hrtime(startTime);
-            targetRunByStatus = (0, _categorizeTargetRunsJs.categorizeTargetRuns)([
-                ...this.targetRuns.values()
-            ]);
+            targetRunByStatus = (0, _categorizeTargetRunsJs.categorizeTargetRuns)(this.targetRuns.values());
             if (targetRunByStatus.failed.length + targetRunByStatus.aborted.length + targetRunByStatus.pending.length + targetRunByStatus.running.length === 0) {
                 results = "success";
             }
@@ -171,6 +174,20 @@ class SimpleScheduler {
         }
         await Promise.all(promises);
     }
+    logProgress() {
+        const targetRunByStatus = (0, _categorizeTargetRunsJs.categorizeTargetRuns)(this.targetRuns.values());
+        const total = [
+            ...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,
+                total
+            }
+        });
+    }
     async cleanup() {
         this.options.logger.silly(`Max Worker Memory Usage: ${(0, _formatBytesJs.formatBytes)(this.pool.stats().maxWorkerMemoryUsage)}`);
         await this.pool.close();
@@ -203,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 {
@@ -228,6 +248,9 @@ 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

@@ -31,6 +31,7 @@ export declare class WrappedTarget implements TargetRun {
     duration: [number, number];
     target: Target;
     status: TargetStatus;
+    threadId: number;
     result: Promise<{
         stdoutBuffer: string;
         stderrBuffer: string;

package/lib/WrappedTarget.js

@@ -39,7 +39,8 @@ class WrappedTarget {
         this.duration = process.hrtime(this.startTime);
         this.options.logger.info("aborted", {
             target: this.target,
-            status: "aborted"
+            status: "aborted",
+            threadId: this.threadId
         });
     }
     onStart() {
@@ -48,7 +49,8 @@ class WrappedTarget {
             this.startTime = process.hrtime();
             this.options.logger.info("running", {
                 target: this.target,
-                status: "running"
+                status: "running",
+                threadId: this.threadId
             });
         }
     }
@@ -58,7 +60,8 @@ class WrappedTarget {
         this.options.logger.info("success", {
             target: this.target,
             status: "success",
-            duration: this.duration
+            duration: this.duration,
+            threadId: this.threadId
         });
     }
     onFail() {
@@ -67,7 +70,8 @@ class WrappedTarget {
         this.options.logger.info("failed", {
             target: this.target,
             status: "failed",
-            duration: this.duration
+            duration: this.duration,
+            threadId: this.threadId
         });
         if (!this.options.continueOnError && this.options.abortController) {
             this.options.abortController.abort();
@@ -80,7 +84,8 @@ class WrappedTarget {
             target: this.target,
             status: "skipped",
             duration: this.duration,
-            hash
+            hash,
+            threadId: this.threadId
         });
     }
     async getCache() {
@@ -192,14 +197,16 @@ class WrappedTarget {
             stdout.pipe(bufferStdout.transform);
             stderr.pipe(bufferStderr.transform);
             const releaseStdoutStream = logger.stream(_logger.LogLevel.verbose, stdout, {
-                target
+                target,
+                threadId: this.threadId
             });
             releaseStdout = ()=>{
                 releaseStdoutStream();
                 stdout.unpipe(bufferStdout.transform);
             };
             const releaseStderrStream = logger.stream(_logger.LogLevel.verbose, stderr, {
-                target
+                target,
+                threadId: this.threadId
             });
             releaseStderr = ()=>{
                 releaseStderrStream();
@@ -241,6 +248,7 @@ class WrappedTarget {
             0,
             0
         ];
+        this.threadId = 0;
         this.status = "pending";
         this.target = options.target;
     }

package/lib/categorizeTargetRuns.d.ts

@@ -1,2 +1,2 @@
 import type { TargetRunSummary, TargetRun } from "@lage-run/scheduler-types";
-export declare function categorizeTargetRuns(targetRuns: TargetRun[]): TargetRunSummary;
+export declare function categorizeTargetRuns<T extends TargetRun>(targetRuns: IterableIterator<T>): TargetRunSummary;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/scheduler",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Scheduler for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -21,7 +21,7 @@
     "@lage-run/worker-threads-pool": "^0.5.0"
   },
   "devDependencies": {
-    "@lage-run/scheduler-types": "^0.2.9",
+    "@lage-run/scheduler-types": "^0.2.10",
     "monorepo-scripts": "*"
   },
   "publishConfig": {