From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 1CJSDlI7UWDRJwAA0tVLHw (envelope-from ) for ; Tue, 16 Mar 2021 23:12:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IGiWCVI7UWD1GwAAbx9fmQ (envelope-from ) for ; Tue, 16 Mar 2021 23:12:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8FCEB16805 for ; Wed, 17 Mar 2021 00:12:17 +0100 (CET) Received: from localhost ([::1]:46244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMIrI-0006C6-Cl for larch@yhetil.org; Tue, 16 Mar 2021 19:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMIr4-0006Ai-OL for guix-patches@gnu.org; Tue, 16 Mar 2021 19:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMIr4-0006xq-HA for guix-patches@gnu.org; Tue, 16 Mar 2021 19:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMIr4-0006eS-CL for guix-patches@gnu.org; Tue, 16 Mar 2021 19:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47160] [PATCH] scripts: substitute: Add back some error handling. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Mar 2021 23:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47160 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 47160@debbugs.gnu.org Received: via spool by 47160-submit@debbugs.gnu.org id=B47160.161593630925550 (code B ref 47160); Tue, 16 Mar 2021 23:12:02 +0000 Received: (at 47160) by debbugs.gnu.org; 16 Mar 2021 23:11:49 +0000 Received: from localhost ([127.0.0.1]:41419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMIqr-0006e2-9I for submit@debbugs.gnu.org; Tue, 16 Mar 2021 19:11:49 -0400 Received: from mira.cbaines.net ([212.71.252.8]:33430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMIqo-0006dr-Gb for 47160@debbugs.gnu.org; Tue, 16 Mar 2021 19:11:47 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 6D62927BC54; Tue, 16 Mar 2021 23:11:45 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a3103721; Tue, 16 Mar 2021 23:11:44 +0000 (UTC) References: <20210315151133.16282-1-mail@cbaines.net> <20210315161532.1716-1-mail@cbaines.net> <87k0q67pn8.fsf_-_@gnu.org> User-agent: mu4e 1.4.15; emacs 27.1 From: Christopher Baines In-reply-to: <87k0q67pn8.fsf_-_@gnu.org> Date: Tue, 16 Mar 2021 23:11:40 +0000 Message-ID: <87eegeelsj.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615936338; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=cPSclhnkOLA0HANgV/PoHXf7BqYM/8uRQCbUfrSqspM=; b=dz7A4AuWxYKAsxAVN4ls8AMqGu0L8xVcNkgVlKszzd0uOpahLqFoF74SOavrVGh9Y11t7i tg2DfAR/teXGFmjhLdHTpxtpn1ZEPpAmgZTjv9wvJNZQJkEypoi42fgTgH+Td+wm+z20q3 f5yNMnW3Z70bpuPJZiYm9Zaq2H9usTYUoN546qasapiExdNjcv5yWxAc9JNbG9/fd2Zc51 4KI9TFmh4xBR8FMDSQGLaPEuzXrHPDx27gOSRXvc+KRgVM/xP61Av6rSuSeSsz9YZgf1in /9scdtXw/Zxvae4FP4TE8p6itLswac9zBJ/6N3b0DTdEFganN4K2P/WKNvUo6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615936338; a=rsa-sha256; cv=none; b=Wqn8LoMXPqyLleCcWSmnEsdV+4tu5k5Arv3nvy/X1T7oM8eCxjm+1c5zQB45AtTanbDcmA wl7qPonNY1e23IlkG9usIif0XJ4rtzMvuQowDpWgKUp1y/kvmHFCAHV9yV6qXSk+Ps0kRv jM1T/H4kpUgVGF+qvz3y88bCMixs+9n5KChhTM651hRA4Fs+NzmtMWoFWMZwsdwhIK2lBc cPpEH7jeODgVrV8Ar7vJRkMuYQokg0gAS1cWyiaaW01wNJKHC8633ta7LlTTL8uKH7pj0k gQbMbYWIVTPDhvOeuxS+LY4bR7DKByES0yBy4iq59AMfXA9u8BmObJwdFCUYMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -4.50 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8FCEB16805 X-Spam-Score: -4.50 X-Migadu-Scanner: scn0.migadu.com X-TUID: NF70bsPJhXwJ --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Christopher Baines skribis: > >> In f50f5751fff4cfc6d5abba9681054569694b7a5c, the way fetch was called wi= thin >> process-substitution was changed. As with-cached-connection actually in= cludes >> important error handling for the opening of a HTTP request (when using a >> cached connection), this change removed some error handling. >> >> This commit adds that error handling back, >> (call-)with-cached-connection is back, rebranded as >> call-with-cached-connection-and-error-handling. >> >> * guix/scripts/substitute.scm (process-substitution): Retry once for some >> errors when making HTTP requests to fetch substitutes. > > Please mention also the new procedure, and a > =E2=80=9CFixes .=E2=80=9D line > >> +(define (call-with-cached-connection-and-error-handling uri proc) >> + (define (get-port) >> + (open-connection-for-uri/cached uri >> + #:verify-certificate? #f)) >> + >> + (let ((port (get-port))) >> + (catch #t >> + (lambda () >> + (proc port)) >> + (lambda (key . args) >> + ;; If PORT was cached and the server closed the connection in t= he >> + ;; meantime, we get EPIPE. In that case, open a fresh connecti= on >> + ;; and retry. We might also get 'bad-response or a similar >> + ;; exception from (web response) later on, once we've sent the >> + ;; request, or a ERROR/INVALID-SESSION from GnuTLS. >> + (if (or (and (eq? key 'system-error) >> + (=3D EPIPE (system-error-errno `(,key ,@args)))) >> + (and (eq? key 'gnutls-error) >> + (eq? (first args) error/invalid-session)) >> + (memq key '(bad-response bad-header bad-header-componen= t))) >> + (begin >> + (close-port port) ; close the port to get a fresh o= ne >> + (proc (get-port))) > > I find it marginally clearer to pass #:fresh? #t (as was done in > the code removed in 7c85877fdf964694061e3192eac35723ebc047bf) than to > rely on the closed-port side effect. > > I think it=E2=80=99s OK to remove =E2=80=98-and-error-handling=E2=80=99 b= ecause that doesn=E2=80=99t > really tell much and because too many words obscure the message IMO, but > that=E2=80=99s a detail. I also like the helper macro as was removed in > 7c85877fdf964694061e3192eac35723ebc047bf. Sure, I'll send a v3 set of patches shortly. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmBROyxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdTOw/5AWZ05MSZ6gfR/2uvGkTXfiOnVGomLOZt c2zr3bTqvXtHXSJ9bjHG0ygRpJHjI+sGYX4JAxzLD4U1JwPRf1tg30vW8pTmpx+e KyyaGimYJc/YXQX3yDkPUeMYl5EJkrI4H3noHCkK+0RoyvKAhdiXtbijD2OPElbB kTkRxWW3UIl/37Z7mXnJmQM2K/E9vH1ICO8KkaMalIImLSkOQPpyV2MNeIfMwsLK YniB9JlhVjk3e+yv3ei8bGCU78+fbrbbEeELXbxi5ah06o0+IbG55TolM/62eWzA a9pB1RyCtwhGx0AHYyFq94Ef8eyrOu53V+36DyH2ql1MifxtdNgf9TrFbUSZQwcJ liYKGZskVbQWCECMqF54aHeLhF8uJuAK9auFCmNkrc8PrMeoxsohsHEtscFvIvF9 t5IjHQDaz9qEkvtIk6TWH6QeIZBYFuXa3bEpQzbC0+w1eFBbxoIpvAXO2dqAgxj9 fvPOz1tBijHoVvUnIE5dlUHvWL7QB8n/smF0M1XhyNHooQmmgzdA/0e73BCfQ0hy SGy44zoLJqtalDacQQg5dhDkUTo1mwEXuD5ITuJ6dd86MNZauRJwAZmOix2+6GE/ E9pUbaFz9hHyaQFsBbHnxnXbyViKlUGVQ6KrEaicvF0hKpL2yBuB1aAXxFPVb9fH xpXOYFFfb14= =Ccxw -----END PGP SIGNATURE----- --=-=-=--