[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#42151: [PATCH 4/3] database: Do not use journal_model=WAL for the Hu
From: |
Ludovic Courtès |
Subject: |
bug#42151: [PATCH 4/3] database: Do not use journal_model=WAL for the Hurd. |
Date: |
Fri, 10 Jul 2020 14:03:08 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Hi!
Jan Nieuwenhuizen <janneke@gnu.org> skribis:
>>From dc6f96fc7de50602fb28d7ad7b8cbff09e55f538 Mon Sep 17 00:00:00 2001
> From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
> Date: Fri, 3 Jul 2020 23:45:20 +0200
> Subject: [PATCH 4/3] database: Do not use journal_model=WAL for the Hurd.
> Content-Transfer-Encoding: 8bit
> Content-Type: text/plain; charset=UTF-8
>
> This fixes <https://bugs.gnu.org/42151>.
>
> * guix/store/database.scm (call-with-database): When building for the Hurd,
> do not set journal_model=WAL.
> ---
> guix/store/database.scm | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/guix/store/database.scm b/guix/store/database.scm
> index a38e4d7e52..da46b0abce 100644
> --- a/guix/store/database.scm
> +++ b/guix/store/database.scm
> @@ -1,6 +1,7 @@
> ;;; GNU Guix --- Functional package management for GNU
> ;;; Copyright © 2017, 2019 Caleb Ristvedt <caleb.ristvedt@cune.org>
> ;;; Copyright © 2018, 2020 Ludovic Courtès <ludo@gnu.org>
> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -20,6 +21,7 @@
> (define-module (guix store database)
> #:use-module (sqlite3)
> #:use-module (guix config)
> + #:use-module (guix gexp)
> #:use-module (guix serialization)
> #:use-module (guix store deduplication)
> #:use-module (guix base16)
> @@ -27,6 +29,7 @@
> #:use-module (guix build syscalls)
> #:use-module ((guix build utils)
> #:select (mkdir-p executable-file?))
> + #:use-module (guix utils)
> #:use-module (guix build store-copy)
> #:use-module (srfi srfi-1)
> #:use-module (srfi srfi-11)
> @@ -105,9 +108,12 @@ create it and initialize it as a new database."
> (mkdir-p (dirname file))
> #t)))
> (db (sqlite-open file)))
> - ;; Turn DB in "write-ahead log" mode, which should avoid SQLITE_LOCKED
> - ;; errors when we have several readers:
> <https://www.sqlite.org/wal.html>.
> - (sqlite-exec db "PRAGMA journal_mode=WAL;")
> + ;; Using WAL breaks for the Hurd <https://bugs.gnu.org/42151>.
> + (unless (let-system (system target)
> + (equal? target "i586-pc-gnu"))
> + ;; Turn DB in "write-ahead log" mode, which should avoid SQLITE_LOCKED
> + ;; errors when we have several readers:
> <https://www.sqlite.org/wal.html>.
> + (sqlite-exec db "PRAGMA journal_mode=WAL;"))
I think this has the same effect as:
(unless #t
(sqlite-exec db "PRAGMA journal_mode=WAL;"))
because this code is not in a gexp, so ‘let-system’ evaluates to an
object (not #f), and that’s it, it’s never lowered and the ‘equal?’ call
is never made.
You want to disable WAL mode not just when running this code natively on
GNU/Hurd, but also when building a database that will eventually be used
on GNU/Hurd, right?
In that case, I think you’ll have to add, say, a #:wal-mode? parameter
to ‘call-with-database’ (defaulting to #true), and change the caller to
set it appropriately. The caller, directly or indirectly, is in a gexp,
where you can use the ‘let-system’ expression above.
Does that make sense?
Thanks, and apologies for the delay!
Ludo’.
- bug#42151: [PATCH 2/3] gnu: guile-sqlite3: Use sqlite/hurd for locking on the Hurd., (continued)
- bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol, Jan Nieuwenhuizen, 2020/07/01
- bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol, Ludovic Courtès, 2020/07/02
- bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol, Jan Nieuwenhuizen, 2020/07/03
- bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol, Ludovic Courtès, 2020/07/03
- bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol, Jan Nieuwenhuizen, 2020/07/03
- bug#42151: [PATCH 4/3] database: Do not use journal_model=WAL for the Hurd., Jan Nieuwenhuizen, 2020/07/04
- bug#42151: [PATCH 4/3] database: Do not use journal_model=WAL for the Hurd., Jan Nieuwenhuizen, 2020/07/07
- bug#42151: [PATCH 4/3] database: Do not use journal_model=WAL for the Hurd.,
Ludovic Courtès <=
- bug#42151: [PATCH 4/3] database: Do not use journal_model=WAL for the Hurd., Jan Nieuwenhuizen, 2020/07/10
- bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol, Ludovic Courtès, 2020/07/10
bug#42151: [PATCH v2 1/4] gnu: Add sqlite/hurd with locking fix., Jan (janneke) Nieuwenhuizen, 2020/07/10
bug#42151: [PATCH v3 1/2] gnu: sqlite: Add locking-mode fix for the Hurd., Jan (janneke) Nieuwenhuizen, 2020/07/10