'guix substitute' stops when first substitute URL is unroutable

DoneSubmitted by Attila Lendvai.
Details
4 participants
  • Attila Lendvai
  • Ludovic Courtès
  • Maxime Devos
  • zimoun
Owner
unassigned
Severity
important
A
A
Attila Lendvai wrote on 21 Sep 15:11 +0200
the fallback machanism for substitute servers doesn't work?
(name . bug-guix@gnu.org)(address . bug-guix@gnu.org)
GH6ClCMfJDFA4PobJSLUVueUqLEv5WxDfh-ekx5Cfu5sUiZM3pNUX_vEr00tR4vg7Z2x3L22NRmWl6HRGseLa8MgT3O9EpUlpOo2MfznfOY=@lendvai.name
ci.guix.gnu.org is down right now. if i add --substitute-urls=http://bordeaux.guix.gnu.orgthen things work, but sans that it fails:


$ ./pre-inst-env guix system --no-graphic vm ~/workspace/guix/guix-crypto/tests/swarm-tests.scm
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
substitute: updating substitutes from 'https://substitutes.nonguix.org'... 100.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%guix substitute: warning: ci.guix.gnu.org: connection failed: No route to host
substitute:
substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 100.0%
The following derivations will be built:
/gnu/store/fkdmiwmvb6ar6n04hr470r3f5frgcbnc-bee-binary-1.8.1.drv
/gnu/store/ksqiqmdijfy34g9qmqhkn3r5kww7v644-bee-linux-amd64.drv
/gnu/store/lgc6jnar1qha8dydhi5p9ni2jawp5wmd-module-import-compiled.drv
/gnu/store/kjza0q20vy6jywfrzr4l5df5va8d5ia9-geth-binary-1.10.25.drv
/gnu/store/f090qzxym89vp3r13fbqlh4ghbnfc7ls-geth-alltools-linux-amd64-1.10.25-69568c55.tar.gz.drv
/gnu/store/kxjd60sx5hxygkz8vfj670f2c70xdjxd-module-import-compiled.drv
/gnu/store/jkp7wrakjv4gqjn475kszaa425zgm62a-openethereum-binary-3.3.5.drv
/gnu/store/d1cl9x0gy0bns9frqwgliq0z7604vian-openethereum-linux-v3.3.5.zip.drv

71.2 MB will be downloaded
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
guix substitute: warning: ci.guix.gnu.org: connection failed: No route to host
qemu-minimal-7.1.0-doc 3.4MiB 876.6MiB/s 00:00 [##################] 100.0%
guix substitute: error: connect*: No route to host
substitution of /gnu/store/7czrnkybr466v69wdj6i2sn6vpsg0ks3-cdrkit-libre-1.1.11 failed
guix system: error: corrupt input while restoring archive from #<closed: file 7f37458bd000>













the second time fails with another package:

$ ./pre-inst-env guix system --no-graphic vm ~/workspace/guix/guix-crypto/tests/swarm-tests.scm
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
guix system: warning: the following groups appear more than once: swarm-mainnet
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%guix substitute: warning: ci.guix.gnu.org: connection failed: No route to host
substitute:
The following derivations will be built:
/gnu/store/fkdmiwmvb6ar6n04hr470r3f5frgcbnc-bee-binary-1.8.1.drv
/gnu/store/ksqiqmdijfy34g9qmqhkn3r5kww7v644-bee-linux-amd64.drv
/gnu/store/lgc6jnar1qha8dydhi5p9ni2jawp5wmd-module-import-compiled.drv
/gnu/store/kjza0q20vy6jywfrzr4l5df5va8d5ia9-geth-binary-1.10.25.drv
/gnu/store/f090qzxym89vp3r13fbqlh4ghbnfc7ls-geth-alltools-linux-amd64-1.10.25-69568c55.tar.gz.drv
/gnu/store/kxjd60sx5hxygkz8vfj670f2c70xdjxd-module-import-compiled.drv
/gnu/store/jkp7wrakjv4gqjn475kszaa425zgm62a-openethereum-binary-3.3.5.drv
/gnu/store/d1cl9x0gy0bns9frqwgliq0z7604vian-openethereum-linux-v3.3.5.zip.drv

71.2 MB will be downloaded
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
substitute: updating substitutes from 'https://ci.guix.gnu.org'... 0.0%
guix substitute: error: connect*: No route to host
substitution of /gnu/store/qvd2h5fd60h9p6yc161mndznf1785c9p-cpio-2.13 failed
guix system: error: corrupt input while restoring archive from #<closed: file 7fdc6f291000>
Z
Z
zimoun wrote on 21 Sep 22:43 +0200
86fsgkzcem.fsf@gmail.com
Hi,

On Wed, 21 Sep 2022 at 13:11, Attila Lendvai <attila@lendvai.name> wrote:
Toggle quote (2 lines)
> ci.guix.gnu.org is down right now. if i add --substitute-urls=http://bordeaux.guix.gnu.orgthen things work, but sans that it fails:

[...]

Toggle quote (4 lines)
> guix substitute: error: connect*: No route to host
> substitution of /gnu/store/7czrnkybr466v69wdj6i2sn6vpsg0ks3-cdrkit-libre-1.1.11 failed
> guix system: error: corrupt input while restoring archive from #<closed: file 7f37458bd000>

I observed the same behaviour. In addition, I notice:

1. even if I have the substitute inside the store of my offloading
machine, then it fails with similar error

2. the option --fallabck does not fallback and does not build locally.


Cheers,
simon
L
L
Ludovic Courtès wrote on 22 Sep 11:33 +0200
control message for bug #57978
(address . control@debbugs.gnu.org)
87czbniwir.fsf@gnu.org
severity 57978 important
quit
L
L
Ludovic Courtès wrote on 22 Sep 11:34 +0200
(address . control@debbugs.gnu.org)
87bkr7iwhd.fsf@gnu.org
retitle 57978 'guix substitute' stops when first substitute URL is unroutable
quit
L
L
Ludovic Courtès wrote on 22 Sep 11:47 +0200
Re: bug#57978: the fallback machanism for substitute servers doesn't work?
(name . Attila Lendvai)(address . attila@lendvai.name)(address . 57978@debbugs.gnu.org)
875yhfivub.fsf@gnu.org
Hi,

Attila Lendvai <attila@lendvai.name> skribis:

Toggle quote (6 lines)
> guix substitute: warning: ci.guix.gnu.org: connection failed: No route to host
> qemu-minimal-7.1.0-doc 3.4MiB 876.6MiB/s 00:00 [##################] 100.0%
> guix substitute: error: connect*: No route to host
> substitution of /gnu/store/7czrnkybr466v69wdj6i2sn6vpsg0ks3-cdrkit-libre-1.1.11 failed
> guix system: error: corrupt input while restoring archive from #<closed: file 7f37458bd000>

I observed the same yesterday when ci.guix was down.

Note that the following command, where 203.* is unroutable, does not
reproduce it:

guix build --substitute-urls="http://203.0.113.1 https://ci.guix.gnu.org" \
--no-grafts pandoc # pick a package not in store

So I believe what we experienced yesterday goes along these lines:

1. We had cached narinfos for ci.guix available locally so the daemon
assumed it could go ahead and download from ci.guix;

2. When ‘guix substitute --substitute’ when to download stuff from
ci.guix, which it assumed was possible because there was a valid
narinfo for that, it didn’t handle the connection failure. (The
same happens if you get, say, 404 while substituting even though
you have a valid substitute at hand.)

Trying to come up with a fix…

Ludo’.
L
L
Ludovic Courtès wrote on 23 Sep 08:16 +0200
[PATCH 0/2] Retry nar downloads upon failure
(address . guix-patches@gnu.org)
20220923061616.5453-1-ludo@gnu.org
Hello!

This is a long overdue fix for https://issues.guix.gnu.org/57978:
when a nar cannot be downloaded from its “preferred” location,
‘guix substitute --substitute’ will now retry once for each substitute
URL instead of failing right away.

This should address the most common issues such as transient
networking failures.

Comments?

Thanks,
Ludo’.

Ludovic Courtès (2):
substitute: Split nar download.
substitute: Retry downloading when a nar is unavailable.

guix/scripts/substitute.scm | 157 +++++++++++++++++++++++++++---------
tests/substitute.scm | 113 ++++++++++++++++++++++++++
2 files changed, 231 insertions(+), 39 deletions(-)


base-commit: a09655b20850d065333ec333e6e184b604f606a8
--
2.37.3
L
L
Ludovic Courtès wrote on 23 Sep 08:19 +0200
[PATCH 1/2] substitute: Split nar download.
(address . 58017@debbugs.gnu.org)
20220923061957.5658-1-ludo@gnu.org
* guix/scripts/substitute.scm (download-nar): New procedure, with most
of the code moved from...
(process-substitution): ... here. Call it.
---
guix/scripts/substitute.scm | 52 +++++++++++++++++++++++--------------
1 file changed, 32 insertions(+), 20 deletions(-)

Toggle diff (85 lines)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index cdf591ac4d..e3b382d0d8 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -437,20 +437,13 @@ (define-syntax-rule (with-cached-connection uri port exp ...)
   "Bind PORT with EXP... to a socket connected to URI."
   (call-with-cached-connection uri (lambda (port) exp ...)))
 
-(define* (process-substitution port store-item destination
-                               #:key cache-urls acl
-                               deduplicate? print-build-trace?)
-  "Substitute STORE-ITEM (a store file name) from CACHE-URLS, and write it to
-DESTINATION as a nar file.  Verify the substitute against ACL, and verify its
-hash against what appears in the narinfo.  When DEDUPLICATE? is true, and if
-DESTINATION is in the store, deduplicate its files.  Print a status line to
-PORT."
-  (define narinfo
-    (lookup-narinfo cache-urls store-item
-                    (if (%allow-unauthenticated-substitutes?)
-                        (const #t)
-                        (cut valid-narinfo? <> acl))))
-
+(define* (download-nar narinfo destination
+                       #:key status-port
+                       deduplicate? print-build-trace?)
+  "Download the nar prescribed in NARINFO, which is assumed to be authentic
+and authorized, and write it to DESTINATION.  When DEDUPLICATE? is true, and
+if DESTINATION is in the store, deduplicate its files.  Print a status line to
+STATUS-PORT."
   (define destination-in-store?
     (string-prefix? (string-append (%store-prefix) "/")
                     destination))
@@ -490,10 +483,6 @@ (define (fetch uri)
        (leave (G_ "unsupported substitute URI scheme: ~a~%")
               (uri->string uri)))))
 
-  (unless narinfo
-    (leave (G_ "no valid substitute for '~a'~%")
-           store-item))
-
   (let ((uri compression file-size
              (narinfo-best-uri narinfo
                                #:fast-decompression?
@@ -575,14 +564,37 @@ (define cpu-usage
       (let ((actual (get-hash)))
         (if (bytevector=? actual expected)
             ;; Tell the daemon that we're done.
-            (format port "success ~a ~a~%"
+            (format status-port "success ~a ~a~%"
                     (narinfo-hash narinfo) (narinfo-size narinfo))
             ;; The actual data has a different hash than that in NARINFO.
-            (format port "hash-mismatch ~a ~a ~a~%"
+            (format status-port "hash-mismatch ~a ~a ~a~%"
                     (hash-algorithm-name algorithm)
                     (bytevector->nix-base32-string expected)
                     (bytevector->nix-base32-string actual)))))))
 
+(define* (process-substitution port store-item destination
+                               #:key cache-urls acl
+                               deduplicate? print-build-trace?)
+  "Substitute STORE-ITEM (a store file name) from CACHE-URLS, and write it to
+DESTINATION as a nar file.  Verify the substitute against ACL, and verify its
+hash against what appears in the narinfo.  When DEDUPLICATE? is true, and if
+DESTINATION is in the store, deduplicate its files.  Print a status line to
+PORT."
+  (define narinfo
+    (lookup-narinfo cache-urls store-item
+                    (if (%allow-unauthenticated-substitutes?)
+                        (const #t)
+                        (cut valid-narinfo? <> acl))))
+
+  (unless narinfo
+    (leave (G_ "no valid substitute for '~a'~%")
+           store-item))
+
+  (download-nar narinfo destination
+                #:status-port port
+                #:deduplicate? deduplicate?
+                #:print-build-trace? print-build-trace?))
+
 
 ;;;
 ;;; Entry point.
-- 
2.37.3
L
L
Ludovic Courtès wrote on 23 Sep 08:19 +0200
[PATCH 2/2] substitute: Retry downloading when a nar is unavailable.
(address . 58017@debbugs.gnu.org)
20220923061957.5658-2-ludo@gnu.org
Reported by Attila Lendvai <attila@lendvai.name>.

Previously, if a narinfo was available but its corresponding nar was
missing (for instance because the narinfo was cached and the server
became unreachable in the meantime), 'guix substitute --substitute'
would try to download the nar from its preferred location and abort when
that fails. This change forces one retry with each of the URLs.

* guix/scripts/substitute.scm (download-nar): Do not catch
'http-get-error?' exceptions.
(system-error?, network-error?, process-substitution/fallback): New
procedures.
(process-substitution): Call 'process-substitution/fallback' upon
'network-error?'.
* tests/substitute.scm ("substitute, first URL has narinfo but lacks nar, second URL unauthorized")
("substitute, first URL has narinfo but nar is 404, both URLs authorized")
("substitute, first URL has narinfo but nar is 404, one URL authorized")
("substitute, narinfo is available but nar is missing"): New tests.
---
guix/scripts/substitute.scm | 113 ++++++++++++++++++++++++++++--------
tests/substitute.scm | 113 ++++++++++++++++++++++++++++++++++++
2 files changed, 203 insertions(+), 23 deletions(-)

Toggle diff (264 lines)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index e3b382d0d8..cf59db4315 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -460,25 +460,20 @@ (define (fetch uri)
        (let ((port (open-file (uri-path uri) "r0b")))
          (values port (stat:size (stat port)))))
       ((http https)
-       (guard (c ((http-get-error? c)
-                  (leave (G_ "download from '~a' failed: ~a, ~s~%")
-                         (uri->string (http-get-error-uri c))
-                         (http-get-error-code c)
-                         (http-get-error-reason c))))
-         ;; Test this with:
-         ;;   sudo tc qdisc add dev eth0 root netem delay 1500ms
-         ;; and then cancel with:
-         ;;   sudo tc qdisc del dev eth0 root
-         (with-timeout %fetch-timeout
-           (begin
-             (warning (G_ "while fetching ~a: server is somewhat slow~%")
-                      (uri->string uri))
-             (warning (G_ "try `--no-substitutes' if the problem persists~%")))
-           (with-cached-connection uri port
-             (http-fetch uri #:text? #f
-                         #:port port
-                         #:keep-alive? #t
-                         #:buffered? #f)))))
+       ;; Test this with:
+       ;;   sudo tc qdisc add dev eth0 root netem delay 1500ms
+       ;; and then cancel with:
+       ;;   sudo tc qdisc del dev eth0 root
+       (with-timeout %fetch-timeout
+         (begin
+           (warning (G_ "while fetching ~a: server is somewhat slow~%")
+                    (uri->string uri))
+           (warning (G_ "try `--no-substitutes' if the problem persists~%")))
+         (with-cached-connection uri port
+           (http-fetch uri #:text? #f
+                       #:port port
+                       #:keep-alive? #t
+                       #:buffered? #f))))
       (else
        (leave (G_ "unsupported substitute URI scheme: ~a~%")
               (uri->string uri)))))
@@ -572,6 +567,68 @@ (define cpu-usage
                     (bytevector->nix-base32-string expected)
                     (bytevector->nix-base32-string actual)))))))
 
+(define system-error?
+  (let ((kind-and-args? (exception-predicate &exception-with-kind-and-args)))
+    (lambda (exception)
+      "Return true if EXCEPTION is a Guile 'system-error exception."
+      (and (kind-and-args? exception)
+           (eq? 'system-error (exception-kind exception))))))
+
+(define network-error?
+  (let ((kind-and-args? (exception-predicate &exception-with-kind-and-args)))
+    (lambda (exception)
+      "Return true if EXCEPTION denotes a networking error."
+      (or (and (system-error? exception)
+               (let ((errno (system-error-errno
+                             (cons 'system-error (exception-args exception)))))
+                 (memv errno (list ECONNRESET ECONNABORTED
+                                   ECONNREFUSED EHOSTUNREACH
+                                   ENOENT))))     ;for "file://"
+          (and (kind-and-args? exception)
+               (memq (exception-kind exception)
+                     '(gnutls-error getaddrinfo-error)))
+          (and (http-get-error? exception)
+               (begin
+                 (warning (G_ "download from '~a' failed: ~a, ~s~%")
+                          (uri->string (http-get-error-uri exception))
+                          (http-get-error-code exception)
+                          (http-get-error-reason exception))
+                 #t))))))
+
+(define* (process-substitution/fallback port narinfo destination
+                                        #:key cache-urls acl
+                                        deduplicate? print-build-trace?)
+  "Attempt to substitute NARINFO, which is assumed to be authorized or
+equivalent, by trying to download its nar from each entry in CACHE-URLS.
+
+This can be less efficient than 'lookup-narinfo', which stops at the first
+entry that provides a valid narinfo, but it makes sure we eventually find a
+way to download the nar."
+  ;; Note: Keep NARINFO's uri-base in CACHE-URLS: that lets us retry in case
+  ;; this was a transient issue.
+  (let loop ((cache-urls cache-urls))
+    (match cache-urls
+      (()
+       (leave (G_ "failed to find alternative substitute for '~a'~%")
+              (narinfo-path narinfo)))
+      ((cache-url rest ...)
+       (match (lookup-narinfos cache-url
+                               (list (narinfo-path narinfo))
+                               #:open-connection
+                               open-connection-for-uri/cached)
+         ((alternate)
+          (if (or (equivalent-narinfo? narinfo alternate)
+                  (valid-narinfo? alternate acl)
+                  (%allow-unauthenticated-substitutes?))
+              (guard (c ((network-error? c) (loop rest)))
+                (download-nar alternate destination
+                              #:status-port port
+                              #:deduplicate? deduplicate?
+                              #:print-build-trace? print-build-trace?))
+              (loop rest)))
+         (()
+          (loop rest)))))))
+
 (define* (process-substitution port store-item destination
                                #:key cache-urls acl
                                deduplicate? print-build-trace?)
@@ -590,10 +647,20 @@ (define narinfo
     (leave (G_ "no valid substitute for '~a'~%")
            store-item))
 
-  (download-nar narinfo destination
-                #:status-port port
-                #:deduplicate? deduplicate?
-                #:print-build-trace? print-build-trace?))
+  (guard (c ((network-error? c)
+             (format (current-error-port)
+                     (G_ "retrying download of '~a' with other substitute URLs...~%")
+                     store-item)
+             (process-substitution/fallback port narinfo destination
+                                            #:cache-urls cache-urls
+                                            #:acl acl
+                                            #:deduplicate? deduplicate?
+                                            #:print-build-trace?
+                                            print-build-trace?)))
+    (download-nar narinfo destination
+                  #:status-port port
+                  #:deduplicate? deduplicate?
+                  #:print-build-trace? print-build-trace?)))
 
 
 ;;;
diff --git a/tests/substitute.scm b/tests/substitute.scm
index 5315292987..9032a50268 100644
--- a/tests/substitute.scm
+++ b/tests/substitute.scm
@@ -523,6 +523,119 @@ (define-syntax-rule (with-narinfo* narinfo directory body ...)
         (lambda ()
           (false-if-exception (delete-file "substitute-retrieved")))))))
 
+(test-equal "substitute, first URL has narinfo but lacks nar, second URL unauthorized"
+  "Substitutable data."
+  (with-narinfo*
+      (string-append %narinfo "Signature: "
+                     (signature-field
+                      %narinfo
+                      #:public-key %wrong-public-key))
+      %alternate-substitute-directory
+
+    (with-narinfo* (string-append %narinfo "Signature: "
+                                  (signature-field %narinfo))
+        %main-substitute-directory
+
+      (dynamic-wind
+        (const #t)
+        (lambda ()
+          ;; Remove this file so that the substitute can only be retrieved
+          ;; from %ALTERNATE-SUBSTITUTE-DIRECTORY.
+          (delete-file (string-append %main-substitute-directory
+                                      "/example.nar"))
+
+          (parameterize ((substitute-urls
+                          (map (cut string-append "file://" <>)
+                               (list %main-substitute-directory
+                                     %alternate-substitute-directory))))
+            (request-substitution (string-append (%store-prefix)
+                                                 "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
+                                  "substitute-retrieved"))
+          (call-with-input-file "substitute-retrieved" get-string-all))
+        (lambda ()
+          (false-if-exception (delete-file "substitute-retrieved")))))))
+
+(test-equal "substitute, first URL has narinfo but nar is 404, both URLs authorized"
+  "Substitutable data."
+  (with-narinfo*
+      (string-append %narinfo "Signature: "
+                     (signature-field %narinfo))
+      %main-substitute-directory
+
+    (with-http-server `((200 ,(string-append %narinfo "Signature: "
+                                             (signature-field %narinfo)))
+                        (404 "Sorry, nar is missing!"))
+      (dynamic-wind
+        (const #t)
+        (lambda ()
+          (parameterize ((substitute-urls
+                          (list (%local-url)
+                                (string-append "file://"
+                                               %main-substitute-directory))))
+            (request-substitution (string-append (%store-prefix)
+                                                 "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
+                                  "substitute-retrieved"))
+          (call-with-input-file "substitute-retrieved" get-string-all))
+        (lambda ()
+          (false-if-exception (delete-file "substitute-retrieved")))))))
+
+(test-equal "substitute, first URL has narinfo but nar is 404, one URL authorized"
+  "Substitutable data."
+  (with-narinfo*
+      (string-append %narinfo "Signature: "
+                     (signature-field
+                      %narinfo
+                      #:public-key %wrong-public-key))
+      %main-substitute-directory
+
+    (with-http-server `((200 ,(string-append %narinfo "Signature: "
+                                             (signature-field
+                                              %narinfo
+                                              #:public-key %wrong-public-key)))
+                        (404 "Sorry, nar is missing!"))
+      (let ((url1 (%local-url)))
+        (parameterize ((%http-server-port 0))
+          (with-http-server `((200 ,(string-append %narinfo "Signature: "
+                                                   (signature-field %narinfo)))
+                              (404 "Sorry, nar is missing!"))
+            (let ((url2 (%local-url)))
+              (dynamic-wind
+                (const #t)
+                (lambda ()
+                  (parameterize ((substitute-urls
+                                  (list url1 url2
+                                        (string-append "file://"
+                                                       %main-substitute-directory))))
+                    (request-substitution (string-append (%store-prefix)
+                                                         "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
+                                          "substitute-retrieved"))
+                  (call-with-input-file "substitute-retrieved" get-string-all))
+                (lambda ()
+                  (false-if-exception (delete-file "substitute-retrieved")))))))))))
+
+(test-quit "substitute, narinfo is available but nar is missing"
+    "failed to find alternative substitute"
+  (with-narinfo*
+      (string-append %narinfo "Signature: "
+                     (signature-field
+                      %narinfo
+                      #:public-key %wrong-public-key))
+      %main-substitute-directory
+
+    (with-http-server `((200 ,(string-append %narinfo "Signature: "
+                                             (signature-field %narinfo)))
+                        (404 "Sorry, nar is missing!"))
+      (parameterize ((substitute-urls
+                      (list (%local-url)
+                            (string-append "file://"
+                                           %main-substitute-directory))))
+        (delete-file (string-append %main-substitute-directory
+                                    "/example.nar"))
+        (request-substitution (string-append (%store-prefix)
+                                             "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
+                              "substitute-retrieved")
+        (not (file-exists? "substitute-retrieved"))))))
+
 (test-equal "substitute, first narinfo is unsigned and has wrong hash"
   "Substitutable data."
   (with-narinfo* (regexp-substitute #f
-- 
2.37.3
Z
Z
zimoun wrote on 23 Sep 09:56 +0200
Re: bug#57978: [PATCH 1/2] substitute: Split nar download.
87tu4ycym8.fsf@gmail.com
Hi,


On ven., 23 sept. 2022 at 08:19, Ludovic Courtès <ludo@gnu.org> wrote:
Toggle quote (4 lines)
> * guix/scripts/substitute.scm (download-nar): New procedure, with most
> of the code moved from...
> (process-substitution): ... here. Call it.

LTGM.

Just to be sure, the patch tweaks the logic checking about narinfo and
it is not mentioned in the commit message, IMHO.



Cheers,
simon
Z
Z
zimoun wrote on 23 Sep 10:17 +0200
Re: bug#57978: [PATCH 2/2] substitute: Retry downloading when a nar is unavailable.
87pmfmcxo3.fsf@gmail.com
Hi,

On ven., 23 sept. 2022 at 08:19, Ludovic Courtès <ludo@gnu.org> wrote:

Toggle quote (20 lines)
> Reported by Attila Lendvai <attila@lendvai.name>.
>
> Previously, if a narinfo was available but its corresponding nar was
> missing (for instance because the narinfo was cached and the server
> became unreachable in the meantime), 'guix substitute --substitute'
> would try to download the nar from its preferred location and abort when
> that fails. This change forces one retry with each of the URLs.
>
> * guix/scripts/substitute.scm (download-nar): Do not catch
> 'http-get-error?' exceptions.
> (system-error?, network-error?, process-substitution/fallback): New
> procedures.
> (process-substitution): Call 'process-substitution/fallback' upon
> 'network-error?'.
> * tests/substitute.scm ("substitute, first URL has narinfo but lacks nar, second URL unauthorized")
> ("substitute, first URL has narinfo but nar is 404, both URLs authorized")
> ("substitute, first URL has narinfo but nar is 404, one URL authorized")
> ("substitute, narinfo is available but nar is missing"): New tests.

LGTM.


Toggle quote (34 lines)
> +(test-equal "substitute, first URL has narinfo but nar is 404, one URL authorized"
> + "Substitutable data."
> + (with-narinfo*
> + (string-append %narinfo "Signature: "
> + (signature-field
> + %narinfo
> + #:public-key %wrong-public-key))
> + %main-substitute-directory
> +
> + (with-http-server `((200 ,(string-append %narinfo "Signature: "
> + (signature-field
> + %narinfo
> + #:public-key %wrong-public-key)))
> + (404 "Sorry, nar is missing!"))
> + (let ((url1 (%local-url)))
> + (parameterize ((%http-server-port 0))
> + (with-http-server `((200 ,(string-append %narinfo "Signature: "
> + (signature-field %narinfo)))
> + (404 "Sorry, nar is missing!"))
> + (let ((url2 (%local-url)))
> + (dynamic-wind
> + (const #t)
> + (lambda ()
> + (parameterize ((substitute-urls
> + (list url1 url2
> + (string-append "file://"
> + %main-substitute-directory))))
> + (request-substitution (string-append (%store-prefix)
> + "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
> + "substitute-retrieved"))
> + (call-with-input-file "substitute-retrieved" get-string-all))
> + (lambda ()
> + (false-if-exception (delete-file "substitute-retrieved")))))))))))

Although I do not understand this test. Why is 404 appearing twice?


Cheers,
simon
M
M
Maxime Devos wrote on 24 Sep 03:57 +0200
Re: [bug#58017] [PATCH 2/2] substitute: Retry downloading when a nar is unavailable.
46a88139-3994-71e5-1a78-398d6926ef88@telenet.be
Toggle quote (23 lines)
> +(test-equal "substitute, first URL has narinfo but nar is 404, both URLs authorized"
> + "Substitutable data."
> + (with-narinfo*
> + (string-append %narinfo "Signature: "
> + (signature-field %narinfo))
> + %main-substitute-directory
> +
> + (with-http-server `((200 ,(string-append %narinfo "Signature: "
> + (signature-field %narinfo)))
> + (404 "Sorry, nar is missing!"))
> + (dynamic-wind
> + (const #t)
> + (lambda ()
> + (parameterize ((substitute-urls
> + (list (%local-url)
> + (string-append "file://"
> + %main-substitute-directory))))
> + (request-substitution (string-append (%store-prefix)
> + "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
> + "substitute-retrieved"))
> + (call-with-input-file "substitute-retrieved" get-string-all))
> + (lambda ()
> + (false-if-exception (delete-file "substitute-retrieved")))))))
Shouldn't it only ignore 'file not found' (ENOENT?) exceptions?
If the exception handling is refined a bit, it becomes a bit more
complicated, and could be simplified to (when [exists] [delete]), as
there are no atomicity concerns.
This test, and some others, can be improved by also checking the URI.
While currently 'with-http-server' does not support that, there are (5
months, with the v1 having seen some reviewing and a v2 available)
patches for that at https://issues.guix.gnu.org/53389.
That patch also _requires_ always mentioning the URI, if the cover
letter is correct. It also allows simplifying the use of '%local-url' a
bit.
Greetings,
Maxime.
Attachment: OpenPGP_signature
L
L
Ludovic Courtès wrote on 24 Sep 18:20 +0200
Re: bug#57978: [PATCH 2/2] substitute: Retry downloading when a nar is unavailable.
(name . zimoun)(address . zimon.toutoune@gmail.com)
87fsgg7nif.fsf@gnu.org
Hi!

zimoun <zimon.toutoune@gmail.com> skribis:

Toggle quote (26 lines)
>> + (with-narinfo*
>> + (string-append %narinfo "Signature: "
>> + (signature-field
>> + %narinfo
>> + #:public-key %wrong-public-key))
>> + %main-substitute-directory
>> +
>> + (with-http-server `((200 ,(string-append %narinfo "Signature: "
>> + (signature-field
>> + %narinfo
>> + #:public-key %wrong-public-key)))
>> + (404 "Sorry, nar is missing!"))
>> + (let ((url1 (%local-url)))
>> + (parameterize ((%http-server-port 0))
>> + (with-http-server `((200 ,(string-append %narinfo "Signature: "
>> + (signature-field %narinfo)))
>> + (404 "Sorry, nar is missing!"))
>> + (let ((url2 (%local-url)))
>> + (dynamic-wind
>> + (const #t)
>> + (lambda ()
>> + (parameterize ((substitute-urls
>> + (list url1 url2
>> + (string-append "file://"
>> + %main-substitute-directory))))

[...]

Toggle quote (2 lines)
> Although I do not understand this test. Why is 404 appearing twice?

That’s because it’s testing with 3 substitute URLs.

Thanks for taking a look!

Ludo’.
L
L
Ludovic Courtès wrote on 24 Sep 18:22 +0200
Re: [bug#58017] [PATCH 2/2] substitute: Retry downloading when a nar is unavailable.
(name . Maxime Devos)(address . maximedevos@telenet.be)
87a66o7ndo.fsf@gnu.org
Hi Maxime,

Maxime Devos <maximedevos@telenet.be> skribis:

Toggle quote (26 lines)
>> +(test-equal "substitute, first URL has narinfo but nar is 404, both URLs authorized"
>> + "Substitutable data."
>> + (with-narinfo*
>> + (string-append %narinfo "Signature: "
>> + (signature-field %narinfo))
>> + %main-substitute-directory
>> +
>> + (with-http-server `((200 ,(string-append %narinfo "Signature: "
>> + (signature-field %narinfo)))
>> + (404 "Sorry, nar is missing!"))
>> + (dynamic-wind
>> + (const #t)
>> + (lambda ()
>> + (parameterize ((substitute-urls
>> + (list (%local-url)
>> + (string-append "file://"
>> + %main-substitute-directory))))
>> + (request-substitution (string-append (%store-prefix)
>> + "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
>> + "substitute-retrieved"))
>> + (call-with-input-file "substitute-retrieved" get-string-all))
>> + (lambda ()
>> + (false-if-exception (delete-file "substitute-retrieved")))))))
>
> Shouldn't it only ignore 'file not found' (ENOENT?) exceptions?

By “it”, do you mean ‘dynamic-wind’ should be replaced by a ‘catch’
form?

We could discuss it, but note that this patch just keeps with the style
of existing tests.

Toggle quote (9 lines)
> This test, and some others, can be improved by also checking the
> URI. While currently 'with-http-server' does not support that, there
> are (5 months, with the v1 having seen some reviewing and a v2
> available) patches for that at <https://issues.guix.gnu.org/53389>.
>
> That patch also _requires_ always mentioning the URI, if the cover
> letter is correct. It also allows simplifying the use of '%local-url'
> a bit.

Ah, thanks for the reminder! I’ve just spent most of the day reviewing
patches, but not that one…

Ludo’.
M
M
Maxime Devos wrote on 24 Sep 19:18 +0200
(name . Ludovic Courtès)(address . ludo@gnu.org)
c0e05b63-3773-7350-76c8-15876fd873bc@telenet.be
On 24-09-2022 18:22, Ludovic Courtès wrote:
Toggle quote (32 lines)
> Hi Maxime,
>
> Maxime Devos <maximedevos@telenet.be> skribis:
>
>>> +(test-equal "substitute, first URL has narinfo but nar is 404, both URLs authorized"
>>> + "Substitutable data."
>>> + (with-narinfo*
>>> + (string-append %narinfo "Signature: "
>>> + (signature-field %narinfo))
>>> + %main-substitute-directory
>>> +
>>> + (with-http-server `((200 ,(string-append %narinfo "Signature: "
>>> + (signature-field %narinfo)))
>>> + (404 "Sorry, nar is missing!"))
>>> + (dynamic-wind
>>> + (const #t)
>>> + (lambda ()
>>> + (parameterize ((substitute-urls
>>> + (list (%local-url)
>>> + (string-append "file://"
>>> + %main-substitute-directory))))
>>> + (request-substitution (string-append (%store-prefix)
>>> + "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
>>> + "substitute-retrieved"))
>>> + (call-with-input-file "substitute-retrieved" get-string-all))
>>> + (lambda ()
>>> + (false-if-exception (delete-file "substitute-retrieved")))))))
>>
>> Shouldn't it only ignore 'file not found' (ENOENT?) exceptions?
>
> By “it”, do you mean ‘dynamic-wind’ should be replaced by a ‘catch’
> form?
No, I'm not referring to the dynamic-wind as a whole, rather 'it' = the
following code:
(false-if-exception (delete-file "substitute-retrieved"))
-- the catch can stay, AFAIK.
Toggle quote (2 lines)
> We could discuss it, but note that this patch just keeps with the style
> of existing tests.
For the reasons given, I don't think this style should be continued,
though I suppose all of them can be done at once in a separate patch.
Greetings,
Maxime.
Attachment: OpenPGP_signature
L
L
Ludovic Courtès wrote on 28 Sep 23:24 +0200
Re: bug#58017: [PATCH 0/2] Retry nar downloads upon failure
(address . 58017-done@debbugs.gnu.org)
87leq3dwf9.fsf_-_@gnu.org
Hi,

Ludovic Courtès <ludo@gnu.org> skribis:

Toggle quote (3 lines)
> substitute: Split nar download.
> substitute: Retry downloading when a nar is unavailable.

Pushed as 8bd4126917f59f4af9a4323c3d5699201862dca2. The ‘guix’ package
has yet to be updated.

Thanks,
Ludo’.
Closed
?