qdone 2.0.30-alpha → 2.0.32-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdone",
-  "version": "2.0.30-alpha",
+  "version": "2.0.32-alpha",
   "description": "Language agnostic job queue for SQS",
   "type": "module",
   "main": "./index.js",

package/src/consumer.js

@@ -119,7 +119,7 @@ export async function processMessages (queues, callback, options) {
 
   while (!shutdownRequested) { // eslint-disable-line
     // Figure out how we are running
-    const allowedJobs = Math.max(0, opt.maxConcurrentJobs - jobExecutor.activeJobCount() - maxReturnCount)
+    const allowedJobs = Math.max(0, opt.maxConcurrentJobs - jobExecutor.runningJobCount() - maxReturnCount)
 
     // Latency
     const maxLatency = 100
@@ -147,7 +147,8 @@ export async function processMessages (queues, callback, options) {
       // console.error({ maxConcurrentJobs: opt.maxConcurrentJobs, jobCount: jobExecutor.activeJobCount(), allowedJobs, maxLatency, latencyFactor, freememFactor, loadFactor, overallFactor, targetJobs, activeQrls })
     }
     for (const { qname, qrl } of queueManager.getPairs()) {
-      // debug({ evaluating: { qname, qrl, jobsLeft, activeQrlsHasQrl: activeQrls.has(qrl) } })
+      // const qcount = jobExecutor.runningJobCountForQueue(qname)
+      // console.log({ evaluating: { qname, qrl, qcount, jobsLeft, activeQrlsHasQrl: activeQrls.has(qrl) } })
       if (jobsLeft <= 0 || activeQrls.has(qrl)) continue
       const maxMessages = Math.min(10, jobsLeft)
       listen(qname, qrl, maxMessages)

package/src/scheduler/jobExecutor.js

@@ -19,6 +19,7 @@ export class JobExecutor {
     this.opt = opt
     this.jobs = []
     this.jobsByMessageId = {}
+    this.jobsByQueue = new Map()
     this.stats = {
       activeJobs: 0,
       waitingJobs: 0,
@@ -40,14 +41,30 @@ export class JobExecutor {
     if (this.opt.verbose) {
       console.error(chalk.blue('Shutting down jobExecutor'))
     }
-    await this.maintainPromise
-    await this.maintainVisibility()
+    while (this.stats.activeJobs > 0) {
+      await this.maintainPromise
+      await this.maintainVisibility()
+    }
   }
 
   activeJobCount () {
     return this.stats.activeJobs
   }
 
+  runningJobCount () {
+    return this.stats.runningJobs
+  }
+
+  /**
+   * Returns the number of jobs running in a queue.
+   */
+  runningJobCountForQueue (qname) {
+    const jobs = this.jobsByQueue.get(qname) || new Set()
+    let runningCount = 0
+    for (const job of jobs.values()) runningCount += job.status === 'running'
+    return runningCount
+  }
+
   /**
    * Changes message visibility on all running jobs using as few calls as possible.
    */
@@ -109,7 +126,16 @@ export class JobExecutor {
 
     if (this.opt.verbose) {
       console.error(chalk.blue('Stats: '), { stats: this.stats, jobStatuses })
-      console.error(chalk.blue('Running: '), this.jobs.filter(j => j.status === 'processing').map(({ qname, message }) => ({ qname, payload: message.Body })))
+      console.error(chalk.blue('Jobs: '))
+      for (const [qname, jobs] of this.jobsByQueue.entries()) {
+        if (jobs.size) {
+          console.error(chalk.blue('  queue:'), qname)
+          for (const job of jobs) if (job.status === 'running') console.error(chalk.green('    running: '), job.payload)
+          for (const job of jobs) if (job.status === 'waiting') console.error(chalk.gold('    waiting:'), job.payload)
+          for (const job of jobs) if (job.status === 'complete' || job.status === 'deleting') console.error(chalk.blue('    complete:'), job.payload)
+          for (const job of jobs) if (job.status === 'failed') console.error(chalk.red('    failed:'), job.payload)
+        }
+      }
     }
 
     // Extend in batches for each queue
@@ -203,7 +229,9 @@ export class JobExecutor {
     this.jobs = this.jobs.filter(job => {
       if (job.status === 'deleting' || job.status === 'failed') {
         debug('removed', job.message.MessageId)
+        // Accounting
         delete this.jobsByMessageId[job.message.MessageId]
+        this.jobsByQueue.get(job.qname).delete(job)
         return false
       } else {
         return true
@@ -240,8 +268,14 @@ export class JobExecutor {
       throw e
     }
 
+    // Accounting
     this.jobs.push(job)
     this.jobsByMessageId[job.message.MessageId] = job
+
+    // Track all jobs for each queue
+    if (!this.jobsByQueue.has(job.qname)) this.jobsByQueue.set(job.qname, new Set())
+    this.jobsByQueue.get(job.qname).add(job)
+
     this.stats.activeJobs++
     this.stats.waitingJobs++
     if (this.opt.verbose) {
@@ -332,13 +366,10 @@ export class JobExecutor {
     // Begin executing
     for (const [job, i] of jobs.map((job, i) => [job, i])) {
       // Figure out if the next job needs to happen in serial, otherwise we can parallel execute
-      // const job = jobs[i]
       const nextJob = jobs[i + 1]
-      const nextJobIsSerial =
-         isFifo && nextJob &&
-         job.message?.Attributes?.GroupId === nextJob.message?.Attributes?.GroupId
+      const nextJobIsSerial = isFifo && nextJob && job.message?.Attributes?.GroupId === nextJob.message?.Attributes?.GroupId
 
-      console.log({ i, nextJobAtt: nextJob.message.Attributes, nextJobIsSerial })
+      // console.log({ i, nextJobAtt: nextJob?.message?.Attributes, nextJobIsSerial })
       // Execute serial or parallel
       if (nextJobIsSerial) await this.runJob(job)
       else this.runJob(job)