@andersbakken/fisk 5.0.7 → 5.0.9

package/builder/fisk-builder.js

@@ -55207,7 +55207,7 @@ class VM extends EventEmitter__default["default"] {
 }
 
 const Version = 5;
-const ObjectCacheFormatVersion = 2;
+const ObjectCacheFormatVersion = 3;
 function cacheDir(option) {
     let dir = option("cache-dir");
     if (!dir) {
@@ -60984,6 +60984,8 @@ server.on("job", (job) => {
                     success: event.success,
                     exitCode: event.exitCode,
                     sha1: jobJob.sha1,
+                    sourcePath: path__default["default"].join(j.op.vmDir, "sourcefile"),
+                    originalSourcePath: jobJob.sourcePath,
                     stderr: j.stderr,
                     stdout: j.stdout
                 };
@@ -61008,7 +61010,6 @@ server.on("job", (job) => {
                                 uncompressedSize: item.uncompressed.byteLength
                             };
                         }) });
-                    cacheResponse.sourcePath = jobJob.sourcePath;
                     cacheResponse.commandLine = jobJob.commandLine;
                     cacheResponse.environment = jobJob.hash;
                     objectCache.add(cacheResponse, contents);

package/daemon/fisk-daemon.js

@@ -3762,7 +3762,7 @@ class Slots extends EventEmitter__default["default"] {
 }
 
 const Version = 5;
-const ObjectCacheFormatVersion = 2;
+const ObjectCacheFormatVersion = 3;
 function cacheDir(option) {
     let dir = option("cache-dir");
     if (!dir) {
@@ -4511,7 +4511,7 @@ const option = createOptions({
 const common = common$1(option);
 const debug = option("debug");
 process.on("unhandledRejection", (reason, p) => {
-    console.log("Unhandled Rejection at: Promise", p, "reason:", reason === null || reason === void 0 ? void 0 : reason.stack);
+    console.error("Unhandled Rejection at: Promise", p, "reason:", reason === null || reason === void 0 ? void 0 : reason.stack);
     process.exit();
     // if (client)
     //     client.send('log', { message: `Unhandled Rejection at: Promise ${p}, reason: ${reason.stack}` });
@@ -4535,6 +4535,7 @@ const compileSlots = new Slots(option.int("slots", Math.max(os__default["default
 const localSlotCount = option.int("local-slots", 0);
 const localSlots = new Slots(localSlotCount, "local", debug);
 const localSlotsMaxLoad = option("local-slots-max-load") || 0;
+console.log(`cpp slots: ${cppSlots.capacity}, compile slots: ${compileSlots.capacity}, local slots: ${localSlots.capacity}, local max load: ${localSlotsMaxLoad}`);
 const compilerInfoCache = new CompilerInfoCache();
 const slotSubscribers = [];
 function slotsInfo() {
@@ -4659,9 +4660,7 @@ server.on("compile", (compile) => {
         }
     });
     compile.on("acquireSlot", (msg) => {
-        if (debug) {
-            console.log("acquireSlot", msg);
-        }
+        console.log("acquireSlot", msg);
         const compilerPath = msg && typeof msg.compiler === "string" && msg.compiler.length > 0 ? msg.compiler : null;
         const infoResult = compilerPath
             ? compilerInfoCache.get(compilerPath).then((info) => ({ info, error: null }), (err) => {
@@ -4688,7 +4687,7 @@ server.on("compile", (compile) => {
                 }
                 compile.send(response);
             };
-            if (canAcquireLocalSlot() && localSlots.tryAcquire(compile.id, { pid: compile.pid })) {
+            if (!(msg === null || msg === void 0 ? void 0 : msg["no-local"]) && canAcquireLocalSlot() && localSlots.tryAcquire(compile.id, { pid: compile.pid })) {
                 if (debug) {
                     console.log("acquireSlot -> local slot granted");
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "5.0.7",
+    "version": "5.0.9",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",

package/scheduler/fisk-scheduler.js

@@ -56418,7 +56418,7 @@ class Server extends require$$0__default$2["default"] {
 }
 
 const Version = 5;
-const ObjectCacheFormatVersion = 2;
+const ObjectCacheFormatVersion = 3;
 function cacheDir(option) {
     let dir = option("cache-dir");
     if (!dir) {
@@ -57979,6 +57979,9 @@ Options:
   --max-file-descriptors=N     File descriptor limit
   --ping-interval=MS           WebSocket ping interval
   --monitor-log=PATH           Log file for monitor events
+  --event-loop-lag-interval=MS Event loop lag sample interval (0 disables)
+  --event-loop-lag-threshold=MS  Log a stall at or above this lag
+  --event-loop-lag-summary-interval=MS  Lag summary interval (0 disables)
   --env-dir=PATH               Directory for compiler environments
   --ui=PATH                    Path to scheduler UI static files
   --cache-dir=PATH             Cache directory (default: ~/.cache/fisk/scheduler)
@@ -57997,6 +58000,41 @@ let nextCommandId = 0;
 const server = new Server(option, common.Version);
 const clientMinimumVersion = "5.0.6";
 const serverStartTime = Date.now();
+// A stalled event loop stops calling accept(), the listen backlog fills and the
+// kernel then silently drops SYNs, which clients see as a connect timeout rather
+// than a refusal. It leaves no trace by the time anyone runs ss(8), so record it
+// here with timestamps that can be correlated against client-side timeouts.
+const intervalMs = option.int("event-loop-lag-interval", 100);
+const thresholdMs = option.int("event-loop-lag-threshold", 250);
+const summaryIntervalMs = option.int("event-loop-lag-summary-interval", 60000);
+if (intervalMs > 0) {
+    let maxLag = 0;
+    let stalls = 0;
+    let expected = Date.now() + intervalMs;
+    const tick = () => {
+        const now = Date.now();
+        const lag = now - expected;
+        if (lag > maxLag) {
+            maxLag = lag;
+        }
+        if (lag >= thresholdMs) {
+            ++stalls;
+            console.log(`event-loop-lag stall ${lag}ms at ${new Date(now).toISOString()}`);
+        }
+        // Schedule off "now" rather than accumulating on expected, otherwise a
+        // single long stall reports as a stall on every subsequent tick.
+        expected = now + intervalMs;
+        setTimeout(tick, intervalMs).unref();
+    };
+    setTimeout(tick, intervalMs).unref();
+    if (summaryIntervalMs > 0) {
+        setInterval(() => {
+            console.log(`event-loop-lag summary max=${maxLag}ms stalls=${stalls} over last ${summaryIntervalMs}ms (threshold ${thresholdMs}ms)`);
+            maxLag = 0;
+            stalls = 0;
+        }, summaryIntervalMs).unref();
+    }
+}
 process.on("unhandledRejection", (reason, p) => {
     console.error("Unhandled Rejection at: Promise", p, "reason:", reason === null || reason === void 0 ? void 0 : reason.stack);
     addLogFile({ source: "no source file", ip: "self", contents: `reason: ${reason.stack} promise` });