From patchwork Thu Apr 4 14:06:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 62719 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 14C2627BBE2; Thu, 4 Apr 2024 15:07:21 +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,URIBL_BLOCKED autolearn=unavailable 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 E274E27BBE9 for ; Thu, 4 Apr 2024 15:07:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsNk7-0000Pk-DT; Thu, 04 Apr 2024 10:07:03 -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 1rsNk5-0000OZ-DA for guix-patches@gnu.org; Thu, 04 Apr 2024 10:07:01 -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 1rsNk5-00023G-45; Thu, 04 Apr 2024 10:07:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsNk7-0001fF-3f; Thu, 04 Apr 2024 10:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69291] [PATCH v2 2/2] scripts: substitute: Extract script specific output from download-nar. 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: Thu, 04 Apr 2024 14:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69291 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69291@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 69291-submit@debbugs.gnu.org id=B69291.17122396026338 (code B ref 69291); Thu, 04 Apr 2024 14:07:03 +0000 Received: (at 69291) by debbugs.gnu.org; 4 Apr 2024 14:06:42 +0000 Received: from localhost ([127.0.0.1]:34422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsNjl-0001e8-DF for submit@debbugs.gnu.org; Thu, 04 Apr 2024 10:06:42 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsNjg-0001dk-Bx for 69291@debbugs.gnu.org; Thu, 04 Apr 2024 10:06:38 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id D551927BBE9 for <69291@debbugs.gnu.org>; Thu, 4 Apr 2024 15:06:29 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 42cc5147 for <69291@debbugs.gnu.org>; Thu, 4 Apr 2024 14:06:29 +0000 (UTC) From: Christopher Baines Date: Thu, 4 Apr 2024 15:06:29 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <6673d6ef271b684628ddbc30c7b198b72b91ad46.1712239589.git.mail@cbaines.net> References: <6673d6ef271b684628ddbc30c7b198b72b91ad46.1712239589.git.mail@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 As this moves download-nar in a direction where it could be used outside the substitute script. * guix/scripts/substitute.scm (download-nar): Return expected and actual hashes and move status-port output to guix-substitute. (process-substitution/fallback): Remove port argument, and move output to port to guix-substitute. (process-substitution): Return hashes from download-nar or process-substitution/fallback, plus the narinfo. (guix-substitute): Don't pass the reply-port in to process-substitution and implement the messages to the reply-port here. Change-Id: Icbddb9a47620b3520cdd2e8095f37a99824c1ce0 --- guix/scripts/substitute.scm | 162 ++++++++++++++++++++---------------- 1 file changed, 90 insertions(+), 72 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 0d0fd0e73b..c2bc16085d 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -453,14 +453,12 @@ (define-syntax-rule (catch-system-error exp) (const #f))) (define* (download-nar narinfo destination - #:key status-port - deduplicate? print-build-trace? + #:key deduplicate? print-build-trace? (fetch-timeout %fetch-timeout) prefer-fast-decompression?) "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." +if DESTINATION is in the store, deduplicate its files." (define destination-in-store? (string-prefix? (string-append (%store-prefix) "/") destination)) @@ -576,24 +574,8 @@ (define* (download-nar narinfo destination ;; Wait for the reporter to finish. (every (compose zero? cdr waitpid) pids) - ;; Skip a line after what 'progress-reporter/file' printed, and another - ;; one to visually separate substitutions. When PRINT-BUILD-TRACE? is - ;; true, leave it up to (guix status) to prettify things. - (newline (current-error-port)) - (unless print-build-trace? - (newline (current-error-port))) - - ;; Check whether we got the data announced in NARINFO. - (let ((actual (get-hash))) - (if (bytevector=? actual expected) - ;; Tell the daemon that we're done. - (format status-port "success ~a ~a~%" - (narinfo-hash narinfo) (narinfo-size narinfo)) - ;; The actual data has a different hash than that in NARINFO. - (format status-port "hash-mismatch ~a ~a ~a~%" - (hash-algorithm-name algorithm) - (bytevector->nix-base32-string expected) - (bytevector->nix-base32-string actual))))))) + (values expected + (get-hash))))) (define (system-error? exception) "Return true if EXCEPTION is a Guile 'system-error exception." @@ -615,7 +597,7 @@ (define network-error? '(gnutls-error getaddrinfo-error))) (http-get-error? exception))))) -(define* (process-substitution/fallback port narinfo destination +(define* (process-substitution/fallback narinfo destination #:key cache-urls acl deduplicate? print-build-trace? prefer-fast-decompression?) @@ -630,9 +612,8 @@ (define* (process-substitution/fallback port narinfo destination (let loop ((cache-urls cache-urls)) (match cache-urls (() - (report-error (G_ "failed to find alternative substitute for '~a'~%") - (narinfo-path narinfo)) - (display "not-found\n" port)) + ;; Failure, so return two values like download-nar + (values #f #f)) ((cache-url rest ...) (match (lookup-narinfos cache-url (list (narinfo-path narinfo)) @@ -650,7 +631,6 @@ (define* (process-substitution/fallback port narinfo destination (http-get-error-reason c))) (loop rest))) (download-nar alternate destination - #:status-port port #:deduplicate? deduplicate? #:print-build-trace? print-build-trace? #:prefer-fast-decompression? @@ -659,7 +639,7 @@ (define* (process-substitution/fallback port narinfo destination (() (loop rest))))))) -(define* (process-substitution port store-item destination +(define* (process-substitution store-item destination #:key cache-urls acl deduplicate? print-build-trace? prefer-fast-decompression?) @@ -680,28 +660,34 @@ (define* (process-substitution port store-item destination (G_ "no valid substitute for '~a'~%") store-item))) - (guard (c ((network-error? c) - (when (http-get-error? c) - (warning (G_ "download from '~a' failed: ~a, ~s~%") - (uri->string (http-get-error-uri c)) - (http-get-error-code c) - (http-get-error-reason 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? - #:prefer-fast-decompression? - prefer-fast-decompression?))) - (download-nar narinfo destination - #:status-port port - #:deduplicate? deduplicate? - #:print-build-trace? print-build-trace? - #:prefer-fast-decompression? prefer-fast-decompression?))) + (let ((expected-hash + actual-hash + (guard + (c ((network-error? c) + (when (http-get-error? c) + (warning (G_ "download from '~a' failed: ~a, ~s~%") + (uri->string (http-get-error-uri c)) + (http-get-error-code c) + (http-get-error-reason c))) + (format + (current-error-port) + (G_ "retrying download of '~a' with other substitute URLs...~%") + store-item) + (process-substitution/fallback narinfo destination + #:cache-urls cache-urls + #:acl acl + #:deduplicate? deduplicate? + #:print-build-trace? + print-build-trace? + #:prefer-fast-decompression? + prefer-fast-decompression?))) + (download-nar narinfo destination + #:deduplicate? deduplicate? + #:print-build-trace? print-build-trace? + #:prefer-fast-decompression? prefer-fast-decompression?)))) + (values narinfo + expected-hash + actual-hash))) ;;; @@ -897,10 +883,13 @@ (define-command (guix-substitute . args) ((? eof-object?) #t) ((= string-tokenize ("substitute" store-path destination)) - (let ((cpu-usage + (let ((narinfo + expected-hash + actual-hash + cpu-usage (with-cpu-usage-monitoring (process-substitution - reply-port store-path destination + store-path destination #:cache-urls (substitute-urls) #:acl (current-acl) #:deduplicate? deduplicate? @@ -909,26 +898,55 @@ (define-command (guix-substitute . args) #:prefer-fast-decompression? prefer-fast-decompression?)))) - ;; Create a hysteresis: depending on CPU usage, favor - ;; compression methods with faster decompression (like ztsd) - ;; or methods with better compression ratios (like lzip). - ;; This stems from the observation that substitution can be - ;; CPU-bound when high-speed networks are used: - ;; . - ;; To simulate "slow" networking or changing conditions, run: - ;; sudo tc qdisc add dev eno1 root tbf rate 512kbit latency - ;; 50ms burst 1540 and then cancel with: sudo tc qdisc del - ;; dev eno1 root - (loop (cond - ;; Whether to prefer fast decompression over good - ;; compression ratios. This serves in particular to - ;; choose between lzip (high compression ratio but low - ;; decompression throughput) and zstd (lower - ;; compression ratio but high decompression - ;; throughput). - ((> cpu-usage .8) #t) - ((< cpu-usage .2) #f) - (else prefer-fast-decompression?))))))))) + (if expected-hash + (begin + ;; Skip a line after what 'progress-reporter/file' + ;; printed, and another one to visually separate + ;; substitutions. When PRINT-BUILD-TRACE? is true, + ;; leave it up to (guix status) to prettify things. + (newline (current-error-port)) + (unless print-build-trace? + (newline (current-error-port))) + + ;; Check whether we got the data announced in NARINFO. + (if (bytevector=? actual-hash expected-hash) + ;; Tell the daemon that we're done. + (format reply-port "success ~a ~a~%" + (narinfo-hash narinfo) (narinfo-size narinfo)) + ;; The actual data has a different hash than that in NARINFO. + (format reply-port "hash-mismatch ~a ~a ~a~%" + (hash-algorithm-name + (narinfo-hash-algorithm+value narinfo)) + (bytevector->nix-base32-string expected-hash) + (bytevector->nix-base32-string actual-hash))) + + ;; Create a hysteresis: depending on CPU usage, favor + ;; compression methods with faster decompression (like + ;; ztsd) or methods with better compression ratios + ;; (like lzip). This stems from the observation that + ;; substitution can be CPU-bound when high-speed + ;; networks are used: + ;; . + ;; To simulate "slow" networking or changing + ;; conditions, run: sudo tc qdisc add dev eno1 root tbf + ;; rate 512kbit latency 50ms burst 1540 and then cancel + ;; with: sudo tc qdisc del dev eno1 root + (loop (cond + ;; Whether to prefer fast decompression over + ;; good compression ratios. This serves in + ;; particular to choose between lzip (high + ;; compression ratio but low decompression + ;; throughput) and zstd (lower compression ratio + ;; but high decompression throughput). + ((> cpu-usage .8) #t) + ((< cpu-usage .2) #f) + (else prefer-fast-decompression?)))) + (begin + (report-error (G_ "failed to find alternative substitute for '~a'~%") + (narinfo-path narinfo)) + (display "not-found\n" reply-port) + + (loop prefer-fast-decompression?))))))))) (opts (leave (G_ "~a: unrecognized options~%") opts))))))