@andersbakken/fisk 3.5.0 → 3.5.1

package/builder/fisk-builder.js

@@ -564,7 +564,22 @@ let jobQueue = [];
 
 server.on("headers", (headers, req) => {
     // console.log("request is", req.headers);
-    let wait = (jobQueue.length >= client.slots || (objectCache && objectCache.state(req.headers["x-fisk-sha1"]) == "exists"));
+    let wait = false;
+    if (objectCache && objectCache.state(req.headers["x-fisk-sha1"]) == "exists") {
+        wait = true;
+    } else if (jobQueue.length >= client.slots) {
+        const priority = parseInt(req.headers["x-fisk-sha1"]) || 0;
+        let idx = jobQueue.length - 1;
+        while (idx >= client.slots) {
+            let job = jobQueue[idx].job;
+            if (job.priority >= priority) {
+                break;
+            }
+            --idx;
+        }
+
+        wait = idx >= client.slots;
+    }
     headers.push(`x-fisk-wait: ${wait}`);
 });
 
@@ -645,7 +660,7 @@ server.on("job", job => {
     let uploadDuration;
 
     // console.log("sending to server");
-    var j = {
+    const j = {
         id: job.id,
         job: job,
         op: undefined,
@@ -840,7 +855,17 @@ server.on("job", job => {
         }
     });
 
-    jobQueue.push(j);
+    let idx = jobQueue.length;
+    while (idx > 0) {
+        const jobJob = jobQueue[idx - 1].job;
+        if (jobJob.priority >= job.priority) {
+            // console.log("Stopping at idx", idx, "Because of", job.priority, jobJob.priority, client.slots, jobJob.length);
+            break;
+        }
+        --idx;
+    }
+    jobQueue.splice(idx, 0, j);
+
     if (jobQueue.length <= client.slots) {
         // console.log(`starting j ${j.id} because ${jobQueue.length} ${client.slots}`);
         j.start();

package/builder/server.js

@@ -123,6 +123,7 @@ class Server extends EventEmitter {
                                hostname: req.headers["x-fisk-client-hostname"],
                                user: req.headers["x-fisk-user"],
                                sourceFile: req.headers["x-fisk-sourcefile"],
+                               priority: parseInt(req.headers["x-fisk-priority"]) || 0,
                                sha1: req.headers["x-fisk-sha1"],
                                id: parseInt(req.headers["x-fisk-job-id"]),
                                builderIp: req.headers["x-fisk-builder-ip"] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andersbakken/fisk",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "Fisk, a distributed compile system",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"