all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Jan Nieuwenhuizen <janneke@gnu.org>
Cc: 42151@debbugs.gnu.org
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	[thread overview]
Message-ID: <87v9iv1ssj.fsf@gnu.org> (raw)
In-Reply-To: <87y2nzr94w.fsf_-_@gnu.org> (Jan Nieuwenhuizen's message of "Sat,  04 Jul 2020 10:12:47 +0200")

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’.




  parent reply	other threads:[~2020-07-10 12:04 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01 14:29 bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol Jan (janneke) Nieuwenhuizen
2020-07-01 14:31 ` bug#42151: [PATCH 1/3] gnu: Add sqlite/hurd with locking fix Jan (janneke) Nieuwenhuizen
2020-07-01 14:31   ` bug#42151: [PATCH 2/3] gnu: guile-sqlite3: Use sqlite/hurd for locking on the Hurd Jan (janneke) Nieuwenhuizen
2020-07-10 12:06     ` Ludovic Courtès
2020-07-10 18:34       ` Jan Nieuwenhuizen
2020-07-01 14:31   ` bug#42151: [PATCH 3/3] gnu: guix: " Jan (janneke) Nieuwenhuizen
2020-07-10 12:07     ` Ludovic Courtès
2020-07-10 16:25       ` Jan Nieuwenhuizen
2020-07-10 12:05   ` bug#42151: [PATCH 1/3] gnu: Add sqlite/hurd with locking fix Ludovic Courtès
2020-07-10 18:34     ` Jan Nieuwenhuizen
2020-07-01 17:01 ` bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol Jan Nieuwenhuizen
2020-07-02 12:49 ` Ludovic Courtès
2020-07-03 10:03   ` Jan Nieuwenhuizen
2020-07-03 13:51     ` Ludovic Courtès
2020-07-03 15:27       ` Jan Nieuwenhuizen
2020-07-04  8:12         ` bug#42151: [PATCH 4/3] database: Do not use journal_model=WAL for the Hurd Jan Nieuwenhuizen
2020-07-07  5:04           ` Jan Nieuwenhuizen
2020-07-10 12:03           ` Ludovic Courtès [this message]
2020-07-10 15:40             ` Jan Nieuwenhuizen
2020-07-10 12:34         ` bug#42151: [PATCH 0/3] offload to Childhurd fails: setting synchronous mode: locking protocol Ludovic Courtès
2020-07-10 15:42 ` bug#42151: [PATCH v2 1/4] gnu: Add sqlite/hurd with locking fix Jan (janneke) Nieuwenhuizen
2020-07-10 15:42   ` bug#42151: [PATCH v2 2/4] gnu: guile-sqlite3: Use sqlite/hurd for locking on the Hurd Jan (janneke) Nieuwenhuizen
2020-07-10 15:42   ` bug#42151: [PATCH v2 3/4] gnu: guix: " Jan (janneke) Nieuwenhuizen
2020-07-10 15:42   ` bug#42151: [PATCH v2 4/4] image: Do not set journal_model=WAL for " Jan (janneke) Nieuwenhuizen
2020-07-10 18:35 ` bug#42151: [PATCH v3 1/2] gnu: sqlite: Add locking-mode fix " Jan (janneke) Nieuwenhuizen
2020-07-10 18:35   ` bug#42151: [PATCH v3 2/2] image: Do not set journal_model=WAL " Jan (janneke) Nieuwenhuizen
2020-07-11 14:22     ` Ludovic Courtès
2020-07-11 14:36       ` Jan Nieuwenhuizen
2020-07-11 14:18   ` bug#42151: [PATCH v3 1/2] gnu: sqlite: Add locking-mode fix " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87v9iv1ssj.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=42151@debbugs.gnu.org \
    --cc=janneke@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.