Skip to content

fix(storage): stop reader lease release deadlocks from failing MySQL runs #268

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

Merged
LouisHaftmann merged 1 commit into from
Sep 13, 2026
Merged

fix(storage): stop reader lease release deadlocks from failing MySQL runs #268

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion lib/storage-leases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Kysely } from 'kysely'
import type { Database, StorageReaderLeaseScope } from './db'
import { randomUUID } from 'node:crypto'
import { retryOnLockConflict } from './db'
import { env } from './env'

export const LEASE_DURATION_MS = 2 * 60 * 1000
Expand Down Expand Up @@ -86,5 +87,8 @@ export async function renewReaderLease(db: Kysely<Database>, id: string) {
}

export async function releaseReaderLease(db: Kysely<Database>, id: string) {
await db.deleteFrom('storage_reader_leases').where('id', '=', id).execute()
// races cascade deletes of the storage location, which lock rows in the opposite order
await retryOnLockConflict(() =>
db.deleteFrom('storage_reader_leases').where('id', '=', id).execute(),
)
}
5 changes: 4 additions & 1 deletion lib/storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ export class Storage {
if (released) return
released = true
clearInterval(renewalTimer)
void releaseReaderLease(this.db, readerLeaseId)
// an unreleased lease only delays cleanup until it expires
releaseReaderLease(this.db, readerLeaseId).catch((err) =>
logger.warn(`Failed to release Storage Reader Lease ${readerLeaseId}`, { error: err }),
)
}
stream.once('end', release)
stream.once('close', release)
Expand Down