diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-12-18 00:35:21 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-12-18 01:17:17 +0100 |
commit | 495c50008be91429ebea3805e161a1e385a2a572 (patch) | |
tree | 86700aa10ba9f39726e2d1895e234304531ff234 | |
parent | 9b6703eabee07068328a5e489deb3d532f242daa (diff) | |
download | guix-495c50008be91429ebea3805e161a1e385a2a572.tar guix-495c50008be91429ebea3805e161a1e385a2a572.tar.gz |
installer: final: Delete SQLite WAL and shm files upon completion.
Previously, db.sqlite-{wal,shm} could be left behind after stopping
guix-daemon. When resuming installation, SQLite could end up behaving
as if transactions visible in the WAL file had been committed, in spite
of having restored SAVED-DATABASE.
Fixes <https://issues.guix.gnu.org/59784>.
Reported by pelzflorian (Florian Pelz) <pelzflorian@pelzflorian.de>.
* gnu/installer/final.scm (install-system): Before restarting
guix-daemon, delete db.sqlite-{wal,shm}.
-rw-r--r-- | gnu/installer/final.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index f5601d8649..069426a3b8 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -221,10 +221,18 @@ or #f. Return #t on success and #f on failure." ;; alive. (stop-service 'guix-daemon) - ;; Restore the database and restart it. + ;; Restore the database and restart it. As part of restoring the + ;; database, remove the WAL and shm files in case they were left + ;; behind after guix-daemon was stopped. Failing to do so, + ;; sqlite might behave as if transactions that appear in the WAL + ;; file were committed. (See <https://www.sqlite.org/wal.html>.) (installer-log-line "restoring store database from '~a'" saved-database) (copy-file saved-database database-file) + (for-each (lambda (suffix) + (false-if-exception + (delete-file (string-append database-file suffix)))) + '("-wal" "-shm")) (start-service 'guix-daemon) ;; Finally umount the cow-store and exit the container. |