Commit 6d71f27
committed
fix(ccswitch-import): recover from malformed leftover journal
Importing from cc-switch failed with
"query failed: attempt to write a readonly database" when cc-switch had been
killed mid-write, leaving a malformed cc-switch.db-journal (truncated/corrupt
rollback journal). SQLite must discard a malformed journal to open the DB — a
write the read-only connection (readOnly:true) refused → SQLITE_READONLY.
Root cause locked deterministically: a *valid* hot journal is skipped cleanly
under readOnly (node:sqlite handles it); only a malformed one trips recovery.
So the trigger is a torn/partial journal from an unclean crash, not a clean one.
Fix in server/lib/ccswitch-import.js: keep the default read-only open (no
SQLITE_BUSY contention with a running cc-switch), but on SQLITE_READONLY escalate
once to a read-write open guarded by PRAGMA query_only = ON (lets SQLite recover
and discard the corrupt journal, blocks our own writes), then retry — mirroring
what cc-switch itself does on its next normal launch. SQLITE_BUSY on the
escalation path surfaces a clear "db is locked; retry shortly" message; other
errors still surface their real cause (query failed: …, e.g. file is not a database).
Test: new test/ccswitch-import.test.js cases plant a garbage -journal next to a
valid DB and assert recovery reads providers + cleans the journal, with a
follow-up plain read-only read proving the DB is left clean.
Build OK; ccswitch-import 30/30 + api-ccswitch-import 7/7; no new failures vs
clean-main baseline.1 parent dd2fa26 commit 6d71f27
3 files changed
Lines changed: 102 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
| |||
155 | 157 | | |
156 | 158 | | |
157 | 159 | | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
166 | 174 | | |
167 | 175 | | |
168 | | - | |
169 | | - | |
| 176 | + | |
170 | 177 | | |
171 | 178 | | |
172 | 179 | | |
| |||
184 | 191 | | |
185 | 192 | | |
186 | 193 | | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
187 | 229 | | |
188 | 230 | | |
189 | 231 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
428 | 428 | | |
429 | 429 | | |
430 | 430 | | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
0 commit comments