parcelvoy/platform
1
0
Fork 0
mirror of https://fast.feibisi.com/https://github.com/parcelvoy/platform.git synced 2025-08-28 11:46:02 +08:00
Code Issues Projects Packages Wiki Activity Actions 1

Improvements to reduce deadlocks (#589)

Browse source
This commit is contained in:
Chris Anderson 2025-01-05 15:58:30 -06:00 • committed by GitHub
parent a5a82c8473
commit e8d2cd97ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/platform/db/migrations/20241228214210_modify_journey_user_step_indexes.js Normal file
View file

@ -0,0 +1,13 @@
exports.up = async function(knex) {
await knex.schema.alterTable('journey_user_step', function(table) {
table.index(['journey_id', 'type', 'delay_until'])
table.dropIndex(['type', 'delay_until'])
})
}
exports.down = async function(knex) {
await knex.schema.alterTable('journey_user_step', function(table) {
table.index(['type', 'delay_until'])
table.dropIndex(['journey_id', 'type', 'delay_until'])
})
}

7
apps/platform/src/lists/ListEvaluateUserJob.ts
View file

@ -1,7 +1,6 @@
import App from '../app'
import { cacheIncr } from '../config/redis'
import { Job } from '../queue'
import { JobPriority } from '../queue/Job'
import { getUser } from '../users/UserRepository'
import { DynamicList } from './List'
import { CacheKeys, cleanupList, evaluateUserList, getList } from './ListService'
@ -17,12 +16,6 @@ interface ListEvaluateUserParams {
export default class ListEvaluateUserJob extends Job {
static $name = 'list_evaluate_user_job'
options = {
delay: 0,
attempts: 3,
priority: JobPriority.low,
}
static from(params: ListEvaluateUserParams): ListEvaluateUserJob {
return new this(params)
}

15
apps/platform/src/utilities/index.ts
View file

@ -224,9 +224,22 @@ export const chunk = async <T>(
modifier: (result: any) => T = (result) => result,
) => {
const chunker = new Chunker(callback, size)
const handler = async (result: any, retries = 3) => {
try {
await chunker.add(modifier(result))
} catch (error: any) {
// In the case of deadlocks, retry the operation
if (['ER_LOCK_WAIT_TIMEOUT', 'ER_LOCK_DEADLOCK'].includes(error.code) && retries > 0) {
setTimeout(() => handler(result, retries - 1), 250)
} else {
throw error
}
}
}
await query.stream(async function(stream) {
for await (const result of stream) {
await chunker.add(modifier(result))
await handler(result)
}
})
await chunker.flush()