Skip to content

fix: sqlite may dead lock in ci #5738

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.

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
merged 6 commits into from
Mar 11, 2025
Merged
Changes from 4 commits
Commits
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
24 changes: 23 additions & 1 deletion core/src/services/sqlite/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -308,5 +308,27 @@ impl kv::Adapter for Adapter {
}

fn parse_sqlite_error(err: sqlx::Error) -> Error {
Error::new(ErrorKind::Unexpected, "unhandled error from sqlite").set_source(err)
let (message, is_temporary) = match &err {
sqlx::Error::Database(db_err) => {
let error_code = db_err.code();
if let Some(code) = error_code {
match code.as_ref() {
"5" => ("database is locked, retry may succeed", true),
"6" => ("database is busy, retry may succeed", true),
_ => ("unhandled error from sqlite", false),
}
} else {
("unhandled error from sqlite", false)
}
}
_ => ("unhandled error from sqlite", false),
};

let mut error = Error::new(ErrorKind::Unexpected, message).set_source(err);

if is_temporary {
error = error.set_temporary();
}

error
}
Loading