screwdriver-queue-service 2.0.36 → 2.0.37

package/package.json

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

package/plugins/queue/scheduler.js

@@ -166,15 +166,6 @@ async function startPeriodic(executor, config) {
 
     if (triggerBuild) {
         config.causeMessage = 'Started by periodic build scheduler';
-
-        // Even if post event failed for this event after retry, we should still enqueue the next event
-        try {
-            await postBuildEvent(executor, config);
-        } catch (err) {
-            logger.error(
-                `periodic builds: failed to post build event for job ${job.id} in pipeline ${pipeline.id}: ${err}`
-            );
-        }
     }
 
     if (buildCron && job.state === 'ENABLED' && !job.archived) {
@@ -214,18 +205,28 @@ async function startPeriodic(executor, config) {
                 logger.error(`failed to enqueue for job ${job.id}: ${err}`);
             }
         }
-        if (!shouldRetry) {
-            logger.info(`successfully added to queue for job ${job.id}`);
 
-            return Promise.resolve();
+        if (shouldRetry) {
+            try {
+                await executor.queue.enqueueAt(next, executor.periodicBuildQueue, 'startDelayed', [{ jobId: job.id }]);
+            } catch (err) {
+                logger.error(`failed to add to delayed queue for job ${job.id}: ${err}`);
+            }
+        } else {
+            logger.info(`successfully added to queue for job ${job.id}`);
         }
+    }
+    logger.info(`added to delayed queue for job ${job.id}`);
+
+    if (triggerBuild) {
         try {
-            await executor.queue.enqueueAt(next, executor.periodicBuildQueue, 'startDelayed', [{ jobId: job.id }]);
+            await postBuildEvent(executor, config);
         } catch (err) {
-            logger.error(`failed to add to delayed queue for job ${job.id}: ${err}`);
+            logger.error(
+                `periodic builds: failed to post build event for job ${job.id} in pipeline ${pipeline.id}: ${err}`
+            );
         }
     }
-    logger.info(`added to delayed queue for job ${job.id}`);
 
     return Promise.resolve();
 }
@@ -536,8 +537,11 @@ async function init(executor) {
     executor.scheduler.on('master', state => logger.info(`scheduler became master ${state}`));
     executor.scheduler.on('error', error => logger.info(`scheduler error >> ${error}`));
     executor.scheduler.on('workingTimestamp', timestamp => logger.info(`scheduler working timestamp ${timestamp}`));
+    executor.scheduler.on('cleanStuckWorker', (workerName, errorPayload, delta) =>
+        logger.info(`scheduler failing ${workerName} (stuck for ${delta}s) and failing job ${errorPayload}`)
+    );
     executor.scheduler.on('transferredJob', (timestamp, job) =>
-        logger.info(`scheduler enqueuing job timestamp  >>  ${JSON.stringify(job)}`)
+        logger.info(`scheduler enqueuing job ${timestamp}  >>  ${JSON.stringify(job)}`)
     );
 
     await executor.multiWorker.start();

package/plugins/worker/worker.js

@@ -123,13 +123,17 @@ async function invoke() {
         scheduler.on('poll', () => logger.info('queueWorker->scheduler polling'));
         scheduler.on('master', state => logger.info(`queueWorker->scheduler became master ${state}`));
         scheduler.on('error', error => logger.info(`queueWorker->scheduler error >> ${error}`));
-        scheduler.on('working_timestamp', timestamp =>
+        scheduler.on('workingTimestamp', timestamp =>
             logger.info(`queueWorker->scheduler working timestamp ${timestamp}`)
         );
-        scheduler.on('transferred_job', (timestamp, job) =>
+        scheduler.on('transferredJob', (timestamp, job) =>
             logger.info(`queueWorker->scheduler enqueuing job timestamp  >> ${timestamp} ${JSON.stringify(job)}`)
         );
-
+        scheduler.on('cleanStuckWorker', (workerName, errorPayload, delta) =>
+            logger.info(
+                `queueWorker->scheduler failing ${workerName} (stuck for ${delta}s) and failing job ${errorPayload}`
+            )
+        );
         multiWorker.start();
 
         await scheduler.connect();