From patchwork Sun Apr 21 09:42:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 63259 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 76A7E27BBEA; Sun, 21 Apr 2024 10:45:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0481627BBE2 for ; Sun, 21 Apr 2024 10:45:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryTjz-0005YK-8B; Sun, 21 Apr 2024 05:44:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ryTjn-0005S1-1X for guix-patches@gnu.org; Sun, 21 Apr 2024 05:43:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ryTjm-0002pd-PA; Sun, 21 Apr 2024 05:43:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryTk0-0006VY-Eo; Sun, 21 Apr 2024 05:44:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70494] [PATCH 16/23] store: database: Log when aborting transactions. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 21 Apr 2024 09:44:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70494 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70494@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 70494-submit@debbugs.gnu.org id=B70494.171369262724689 (code B ref 70494); Sun, 21 Apr 2024 09:44:08 +0000 Received: (at 70494) by debbugs.gnu.org; 21 Apr 2024 09:43:47 +0000 Received: from localhost ([127.0.0.1]:41783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryTjd-0006Pt-Iz for submit@debbugs.gnu.org; Sun, 21 Apr 2024 05:43:46 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryTiz-0006Hz-K3 for 70494@debbugs.gnu.org; Sun, 21 Apr 2024 05:43:08 -0400 Received: from localhost (unknown [IPv6:2a02:6b67:d93b:1:254c:b471:debc:14be]) by mira.cbaines.net (Postfix) with ESMTPSA id 5B86A27BBF6 for <70494@debbugs.gnu.org>; Sun, 21 Apr 2024 10:42:48 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7e4e40b7 for <70494@debbugs.gnu.org>; Sun, 21 Apr 2024 09:42:48 +0000 (UTC) From: Christopher Baines Date: Sun, 21 Apr 2024 10:42:34 +0100 Message-ID: <21c24e8933feb110c2e6cd5782d39adab3b66546.1713692561.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87bk632h36.fsf@cbaines.net> References: <87bk632h36.fsf@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Otherwise this has the effect of masking the backtrace/exception. * guix/store/database.scm (call-with-transaction): Log when aborting. Change-Id: Iee31905c4688dc62ef37a85b0208fd324ee67d70 --- guix/store/database.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/guix/store/database.scm b/guix/store/database.scm index 8a3436368e..b6f87d710f 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -154,9 +154,17 @@ (define* (call-with-transaction db proc #:key restartable?) (sqlite-exec db (if restartable? "begin;" "begin immediate;")) (catch #t (lambda () - (let-values ((result (proc))) - (sqlite-exec db "commit;") - (apply values result))) + (with-throw-handler #t + (lambda () + (call-with-values proc + (lambda vals + (sqlite-exec db "commit;") + (apply values vals)))) + (lambda (key args) + (simple-format + (current-error-port) + "transaction aborted: ~A: ~A\n" key args) + (backtrace)))) (lambda args ;; The roll back may or may not have occurred automatically when the ;; error was generated. If it has occurred, this does nothing but signal