Skip to content

fix(postgres): make advisory lock cancel safe #4199

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
abonander merged 3 commits into from
Mar 26, 2026
Merged

fix(postgres): make advisory lock cancel safe #4199

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06c29fb
fix(postgres): make advisory lock cancel safe
joeydewaal Mar 23, 2026
94894c5
fix(postgres): prepare advisory lock acquire query first
joeydewaal Mar 24, 2026
afaa3e8
document cancel safety
joeydewaal Mar 26, 2026
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
12 changes: 7 additions & 5 deletions sqlx-postgres/src/advisory_lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,12 @@ impl PgAdvisoryLock {
/// See [Postgres' documentation for the Advisory Lock Functions][advisory-funcs] for details.
///
/// [advisory-funcs]: https://www.postgresql.org/docs/current/functions-admin.html#FUNCTIONS-ADVISORY-LOCKS
pub async fn acquire<C: AsMut<PgConnection>>(
&self,
mut conn: C,
) -> Result<PgAdvisoryLockGuard<C>> {
pub async fn acquire<C: AsMut<PgConnection>>(&self, conn: C) -> Result<PgAdvisoryLockGuard<C>> {
// We're wrapping the connection in a `PgAdvisoryLockGuard` early here on purpose. If this
// future is dropped, the lock will be released in the drop impl.
let mut guard = PgAdvisoryLockGuard::new(self.clone(), conn);
Comment thread
abonander marked this conversation as resolved.
let conn = guard.conn.as_mut().unwrap();

match &self.key {
PgAdvisoryLockKey::BigInt(key) => {
crate::query::query("SELECT pg_advisory_lock($1)")
Expand All @@ -219,7 +221,7 @@ impl PgAdvisoryLock {
}
}

Ok(PgAdvisoryLockGuard::new(self.clone(), conn))
Ok(guard)
}

/// Acquires an exclusive lock using `pg_try_advisory_lock()`, returning immediately
Expand Down
Loading