database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-12-21 13:38:01 +03:00
Code Activity

If blocking locks are enabled, avoid using the busy handler when blocked by another process running recovery.

Browse Source 
FossilOrigin-Name: a35236757ab57c4c9b34e47c5dbc10d8f1220f8152955f5303cf9c3902ee169b
This commit is contained in:
dan
2025-05-30 20:52:18 +00:00
parent 88ed38ca6d
commit ded1959120
7 changed files with 123 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/os_unix.c
View File

@@ -5043,13 +5043,14 @@ static int unixShmLock(
** occur later in the above list than the lock being obtained may be
** held.
**
** It is not permitted to block on the RECOVER lock.
** It is not permitted to block on the RECOVER lock if any other
** locks are held.
*/
#if defined(SQLITE_ENABLE_SETLK_TIMEOUT) && defined(SQLITE_DEBUG)
{
u16 lockMask = (p->exclMask|p->sharedMask);
assert( (flags & SQLITE_SHM_UNLOCK) || pDbFd->iBusyTimeout==0 || (
(ofst!=2) /* not RECOVER */
(ofst!=2 || lockMask==0) /* not RECOVER */
&& (ofst!=1 || lockMask==0 || lockMask==2)
&& (ofst!=0 || lockMask<3)
&& (ofst<3 || lockMask<(1<<ofst))