database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

When walTryBeginRead() encounters an I/O error trying to set a lock

Browse Source 
(as opposed to SQLITE_BUSY) be sure to propagate that error back up
the call stack.

FossilOrigin-Name: aa2c2b67a7f50c97a44cca1af5c437bf5410869c
This commit is contained in:
drh
2010-06-02 15:43:18 +00:00
parent aab4c02e47
commit 38933f2c11
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Changes\sto\smake\sWAL\smore\srobust\sagainst\sSHM\slocking\sfailures\sand\sOOM\serrors. C When\swalTryBeginRead()\sencounters\san\sI/O\serror\strying\sto\sset\sa\slock\n(as\sopposed\sto\sSQLITE_BUSY)\sbe\ssure\sto\spropagate\sthat\serror\sback\sup\nthe\scall\sstack.
D 2010-06-02T14:45:51 D 2010-06-02T15:43:19
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -227,7 +227,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
F src/wal.c e36af9e75768d1dc790392089b10cf272abccefa F src/wal.c 125cc67e8e5c091ef78f3a499524701bcddbb8f4
F src/wal.h 1c1c9feb629b7f4afcbe0b47f80f47c5551d3a02 F src/wal.h 1c1c9feb629b7f4afcbe0b47f80f47c5551d3a02
F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -818,14 +818,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 28efe0a40405567f3eaf334b6603282d5adac792 P ebf4041383c3cdddb5861960359abd209d4a1028
R 9d892b2c2c5007a01a863a8338bf83dd R 146e415727264052c9d4dd27cc8edf23
U drh U drh
Z 8d64b4080a97b8f66f1bf92b76c05ca5 Z f52d8b5f69dae5d7205fbd3555d1baba
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMBm6ioxKgR168RlERAqErAJ9ySZWhR4zIr4TMIPtUXND7LUScBACeK1dS iD8DBQFMBnwaoxKgR168RlERAsy1AJ9m3DJr8tnAvh2cVk36fUctAyoRTgCcCxt0
Xn9N4779qMX9jCkGApiXX1s= SdrFAsrnYtTR4pEkGlu1qY8=
=nr7w =bO80
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
ebf4041383c3cdddb5861960359abd209d4a1028 aa2c2b67a7f50c97a44cca1af5c437bf5410869c

7
src/wal.c
View File

@@ -1783,8 +1783,11 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
pInfo->aReadMark[1] = pWal->hdr.mxFrame+1; pInfo->aReadMark[1] = pWal->hdr.mxFrame+1;
walUnlockExclusive(pWal, WAL_READ_LOCK(1), 1); walUnlockExclusive(pWal, WAL_READ_LOCK(1), 1);
rc = WAL_RETRY;
}else if( rc==SQLITE_BUSY ){
rc = WAL_RETRY;
} }
return WAL_RETRY; return rc;
}else{ }else{
if( mxReadMark < pWal->hdr.mxFrame ){ if( mxReadMark < pWal->hdr.mxFrame ){
for(i=1; i<WAL_NREADER; i++){ for(i=1; i<WAL_NREADER; i++){
@@ -1794,6 +1797,8 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
mxI = i; mxI = i;
walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1); walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
break; break;
}else if( rc!=SQLITE_BUSY ){
return rc;
} }
} }
} }