Skip to content

Deletion robustness WIP #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ryanwitt wants to merge 1 commit into
base: v2
Choose a base branch
from
Draft

Deletion robustness WIP #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/idleQueues.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getCloudWatchClient } from './cloudWatch.js'
import { getOptionsWithDefaults } from './defaults.js'
import { GetQueueAttributesCommand, DeleteQueueCommand, QueueDoesNotExist } from '@aws-sdk/client-sqs'
import { GetMetricStatisticsCommand } from '@aws-sdk/client-cloudwatch'
import { normalizeFailQueueName, getQnameUrlPairs, fifoSuffix } from './qrlCache.js'
import { normalizeFailQueueName, normalizeDLQName, getQnameUrlPairs, fifoSuffix } from './qrlCache.js'
import { getCache, setCache } from './cache.js'
// const AWS = require('aws-sdk')

Expand Down Expand Up @@ -218,6 +218,9 @@ export async function processQueuePair (qname, qrl, opt) {
// Generate fail queue name/url
const fqname = normalizeFailQueueName(qname, normalizeOptions)
const fqrl = normalizeFailQueueName(fqname, normalizeOptions)
// Generate DLQ name/url
const dqname = normalizeDLQName(qname, normalizeOptions)
const dqrl = normalizeDLQName(fqname, normalizeOptions)

// Idle check
const result = await checkIdle(qname, qrl, opt)
Expand All @@ -229,7 +232,7 @@ export async function processQueuePair (qname, qrl, opt) {
if (opt.verbose) console.error(chalk.blue('Queue ') + qname.slice(opt.prefix.length) + chalk.blue(' has been ') + 'active' + chalk.blue(' in the last ') + opt.idleFor + chalk.blue(' minutes.'))
return result
}

// Queue is idle
if (opt.verbose) console.error(chalk.blue('Queue ') + qname.slice(opt.prefix.length) + chalk.blue(' has been ') + 'idle' + chalk.blue(' for the last ') + opt.idleFor + chalk.blue(' minutes.'))

Expand Down Expand Up @@ -260,10 +263,22 @@ export async function processQueuePair (qname, qrl, opt) {

// Trigger a delete if the user wants it
if (!opt.delete) return idleCheckResult
const [dresult, dfresult] = await Promise.all([
deleteQueue(qname, qrl, opt),
deleteQueue(fqname, fqrl, opt)
])

let dresult, dfresult
try {
dresult = await deleteQueue(qname, qrl, opt)
} catch (e) {
// Ignore queues that don't exist already in case that: 1) there was a double
// call or 2) the SQS node that got the request is not consistent yet
if (!(e instanceof QueueDoesNotExist)) throw e
}
try {
dfresult = await deleteQueue(fqname, fqrl, opt)
} catch (e) {
// Ignore queues that don't exist already in case that: 1) there was a double
// call or 2) the SQS node that got the request is not consistent yet
if (!(e instanceof QueueDoesNotExist)) throw e
}
return Object.assign(idleCheckResult, {
apiCalls: {
// Sum the SQS calls across all four
Expand Down