screwdriver-queue-service 2.0.30 → 2.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-queue-service",
-  "version": "2.0.30",
+  "version": "2.0.33",
   "description": "Screwdriver Queue Service API",
   "main": "app.js",
   "directories": {
@@ -29,7 +29,7 @@
     "npm-auto-version": "^1.0.0",
     "redlock": "^4.2.0",
     "screwdriver-aws-producer-service": "^1.3.0",
-    "screwdriver-data-schema": "^21.17.0",
+    "screwdriver-data-schema": "^21.23.0",
     "screwdriver-executor-docker": "^5.0.2",
     "screwdriver-executor-jenkins": "^5.0.1",
     "screwdriver-executor-k8s": "^14.16.0",

package/plugins/queue/scheduler.js

@@ -14,6 +14,7 @@ const RETRY_DELAY = 5;
 const EXPIRE_TIME = 1800; // 30 mins
 const TEMPORAL_TOKEN_TIMEOUT = 12 * 60; // 12 hours in minutes
 const TEMPORAL_UNZIP_TOKEN_TIMEOUT = 2 * 60; // 2 hours in minutes
+const BLOCKED_BY_SAME_JOB_WAIT_TIME = 5;
 
 /**
  * Posts a new build event to the API
@@ -253,6 +254,7 @@ async function startPeriodic(executor, config) {
  */
 async function start(executor, config) {
     await executor.connect();
+
     const {
         build,
         buildId,
@@ -383,12 +385,23 @@ async function start(executor, config) {
         // Store the config in redis
         await executor.redisBreaker.runCommand('hset', executor.buildConfigTable, buildId, JSON.stringify(config));
 
+        const blockedBySameJob = reach(config, 'annotations>screwdriver.cd/blockedBySameJob', {
+            separator: '>',
+            default: true
+        });
+        const blockedBySameJobWaitTime = reach(config, 'annotations>screwdriver.cd/blockedBySameJobWaitTime', {
+            separator: '>',
+            default: BLOCKED_BY_SAME_JOB_WAIT_TIME
+        });
+
         // Note: arguments to enqueue are [queue name, job name, array of args]
         enq = await executor.queueBreaker.runCommand('enqueue', executor.buildQueue, 'start', [
             {
                 buildId,
                 jobId,
-                blockedBy: blockedBy.toString()
+                blockedBy: blockedBy.toString(),
+                blockedBySameJob,
+                blockedBySameJobWaitTime
             }
         ]);
         if (buildStats) {

package/plugins/worker/lib/BlockedBy.js

@@ -17,6 +17,7 @@ const redlock = new Redlock([redis], {
 });
 const REDIS_LOCK_TTL = 10000; // in ms
 const BLOCK_TIMEOUT_BUFFER = 30;
+const BLOCKED_BY_SAME_JOB_WAIT_TIME = 5;
 
 /**
  * collapse waiting builds and re-enequeue the current build if it is the latest one
@@ -208,7 +209,32 @@ async function checkBlockingJob({ jobId, buildId }) {
 
     let blockedBy = this.args[0].blockedBy.split(',').map(jid => `${runningJobsPrefix}${jid}`);
 
-    if (!enforceBlockedBySelf) {
+    let blockedBySameJob = true;
+    let blockedBySameJobWaitTime = BLOCKED_BY_SAME_JOB_WAIT_TIME;
+
+    if (typeof this.args[0].blockedBySameJob === 'boolean') {
+        blockedBySameJob = this.args[0].blockedBySameJob;
+    }
+
+    if (typeof this.args[0].blockedBySameJobWaitTime === 'number') {
+        blockedBySameJobWaitTime = this.args[0].blockedBySameJobWaitTime;
+    }
+
+    const json = await this.queueObject.connection.redis.hget(`${queuePrefix}timeoutConfigs`, lastRunningBuildId);
+    const timeoutConfig = JSON.parse(json);
+    let notBlockedBySameJob = false;
+
+    if (!blockedBySameJob && timeoutConfig) {
+        const { startTime } = timeoutConfig;
+        const diffMs = new Date().getTime() - new Date(startTime).getTime();
+        const diffMins = Math.round(diffMs / 60000);
+
+        if (diffMins >= blockedBySameJobWaitTime) {
+            notBlockedBySameJob = true;
+        }
+    }
+
+    if (notBlockedBySameJob || !enforceBlockedBySelf) {
         blockedBy = blockedBy.filter(key => key !== `${runningJobsPrefix}${jobId}`); // remove itself from blocking list
     }