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

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

FossilOrigin-Name: aa2c2b67a7f50c97a44cca1af5c437bf5410869c

diff --git a/manifest b/manifest
index 748756246d177cf93a473e96797a9c5d81d7bc7b..b691ccc674b877a1f03ecd653e47f1cf46794e25 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Changes\sto\smake\sWAL\smore\srobust\sagainst\sSHM\slocking\sfailures\sand\sOOM\serrors.
-D 2010-06-02T14:45:51
+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-02T15:43:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -227,7 +227,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c e36af9e75768d1dc790392089b10cf272abccefa
+F src/wal.c 125cc67e8e5c091ef78f3a499524701bcddbb8f4
 F src/wal.h 1c1c9feb629b7f4afcbe0b47f80f47c5551d3a02
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -818,14 +818,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 28efe0a40405567f3eaf334b6603282d5adac792
-R 9d892b2c2c5007a01a863a8338bf83dd
+P ebf4041383c3cdddb5861960359abd209d4a1028
+R 146e415727264052c9d4dd27cc8edf23
 U drh
-Z 8d64b4080a97b8f66f1bf92b76c05ca5
+Z f52d8b5f69dae5d7205fbd3555d1baba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMBm6ioxKgR168RlERAqErAJ9ySZWhR4zIr4TMIPtUXND7LUScBACeK1dS
-Xn9N4779qMX9jCkGApiXX1s=
-=nr7w
+iD8DBQFMBnwaoxKgR168RlERAsy1AJ9m3DJr8tnAvh2cVk36fUctAyoRTgCcCxt0
+SdrFAsrnYtTR4pEkGlu1qY8=
+=bO80
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 2f899a051369e6edb9fff6d7b69baf9e6e19ae77..060b476fbcf0c8450cba40fbcc81a7506ac7bdc0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ebf4041383c3cdddb5861960359abd209d4a1028
\ No newline at end of file
+aa2c2b67a7f50c97a44cca1af5c437bf5410869c
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 397a592b5d8afe682c6a00febb89b25ca9bbab76..807622774009de3a08683b0e000003f7ff78e178 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -1783,8 +1783,11 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
     if( rc==SQLITE_OK ){
       pInfo->aReadMark[1] = pWal->hdr.mxFrame+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{
     if( mxReadMark < pWal->hdr.mxFrame ){
       for(i=1; i<WAL_NREADER; i++){
@@ -1794,6 +1797,8 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int cnt){
           mxI = i;
           walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
           break;
+        }else if( rc!=SQLITE_BUSY ){
+          return rc;
         }
       }
     }