Skip to content

fix(storage): serialize msg_secret reads through the db semaphore #832

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
jlucaso1 merged 1 commit into from
Jun 10, 2026
Merged

fix(storage): serialize msg_secret reads through the db semaphore #832

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
13 changes: 9 additions & 4 deletions storages/sqlite-storage/src/sqlite_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2869,12 +2869,15 @@ impl MsgSecretStore for SqliteStore {
sender: &str,
msg_id: &str,
) -> Result<Option<Vec<u8>>> {
// Serialized through the db semaphore for the same reason as
// get_msg_secret_with_ts: a read racing a write transaction must wait,
// not error out as a phantom miss.
let pool = self.pool.clone();
let device_id = self.device_id;
let chat = chat.to_string();
let sender = sender.to_string();
let msg_id = msg_id.to_string();
tokio::task::spawn_blocking(move || -> Result<Option<Vec<u8>>> {
self.with_semaphore(move || -> Result<Option<Vec<u8>>> {
let mut conn = pool
.get()
.map_err(|e| StoreError::Connection(Box::new(e)))?;
Expand All @@ -2890,7 +2893,6 @@ impl MsgSecretStore for SqliteStore {
Ok(row)
})
.await
.map_err(|e| StoreError::Database(Box::new(e)))?
}

async fn get_msg_secret_with_ts(
Expand All @@ -2899,12 +2901,16 @@ impl MsgSecretStore for SqliteStore {
sender: &str,
msg_id: &str,
) -> Result<Option<(Vec<u8>, i64)>> {
// Serialized through the db semaphore: a raw read racing a write
// transaction hits the shared-cache table lock on in-memory stores
// (SQLITE_LOCKED is not covered by busy_timeout) and callers treat the
// error as a missing secret.
let pool = self.pool.clone();
let device_id = self.device_id;
let chat = chat.to_string();
let sender = sender.to_string();
let msg_id = msg_id.to_string();
tokio::task::spawn_blocking(move || -> Result<Option<(Vec<u8>, i64)>> {
self.with_semaphore(move || -> Result<Option<(Vec<u8>, i64)>> {
let mut conn = pool
.get()
.map_err(|e| StoreError::Connection(Box::new(e)))?;
Expand All @@ -2920,7 +2926,6 @@ impl MsgSecretStore for SqliteStore {
Ok(row)
})
.await
.map_err(|e| StoreError::Database(Box::new(e)))?
}

async fn delete_expired_msg_secrets(&self, cutoff_timestamp: i64) -> Result<u32> {
Expand Down
Loading