screwdriver-queue-service 3.0.5 → 3.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-queue-service",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Screwdriver Queue Service API",
   "main": "app.js",
   "directories": {

package/plugins/queue/scheduler.js

@@ -221,6 +221,9 @@ async function startPeriodic(executor, config) {
 
         // Note: arguments to enqueueAt are [timestamp, queue name, job name, array of args]
         let shouldRetry = false;
+        const nextDate = new Date(next);
+
+        logger.info(`Enqueued periodic job ${job.id} to be executed at ${nextDate}`);
 
         try {
             await executor.queue.enqueueAt(next, executor.periodicBuildQueue, 'startDelayed', [{ jobId: job.id }]);
@@ -229,9 +232,9 @@ async function startPeriodic(executor, config) {
             // eslint-disable-next-line max-len
             if (err && err.message !== 'Job already enqueued at this time with same arguments') {
                 shouldRetry = true;
-                logger.warn(`duplicate build: failed to enqueue for job ${job.id}: ${err}`);
-            } else {
                 logger.error(`failed to enqueue for job ${job.id}: ${err}`);
+            } else {
+                logger.warn(`duplicate build: failed to enqueue for job ${job.id}: ${err}`);
             }
         }
 
@@ -523,13 +526,13 @@ async function init(executor) {
                         };
                     }
 
-                    return await startPeriodic(executor, fullConfig);
+                    await startPeriodic(executor, fullConfig);
                 } catch (err) {
                     logger.error(`err in startDelayed job: ${err}`);
                     throw err;
                 }
             },
-            plugins: [Plugins.Retry, Plugins.JobLock],
+            plugins: [Plugins.Retry, Plugins.JobLock, Plugins.DelayQueueLock, Plugins.QueueLock],
             pluginOptions: {
                 JobLock: {
                     reEnqueue: false

package/plugins/queue/utils/cron.js

@@ -107,7 +107,15 @@ const transformCron = (cronExp, jobId) => {
  * @return {Number}         Epoch timestamp (time of next execution).
  */
 const nextExecution = cronExp => {
-    const interval = parseExpression(cronExp);
+    // Scheduled jobs may run a little ahead of schedule.
+    // The next job to be executed is delayed so that it will be at the next timing even in that case.
+    const date = new Date();
+
+    date.setMinutes(date.getMinutes() + 5);
+    const options = {
+        currentDate: date
+    };
+    const interval = parseExpression(cronExp, options);
 
     return interval.next().getTime();
 };