From patchwork Wed Mar 27 13:43:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 62277 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 4E30F27BBE2; Wed, 27 Mar 2024 13:44:19 +0000 (GMT) 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 1AD6C27BBE9 for ; Wed, 27 Mar 2024 13:44:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpTZX-0001Bf-Iq; Wed, 27 Mar 2024 09: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 1rpTZV-0001BI-S8 for guix-patches@gnu.org; Wed, 27 Mar 2024 09:44:05 -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 1rpTZV-00013J-Iu; Wed, 27 Mar 2024 09:44:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpTZS-0005UE-7R; Wed, 27 Mar 2024 09:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70028] [PATCH] Switch order of the default substitute servers. 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: Wed, 27 Mar 2024 13:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70028@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-To: guix-patches@gnu.org 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 submit@debbugs.gnu.org id=B.171154703921054 (code B ref -1); Wed, 27 Mar 2024 13:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Mar 2024 13:43:59 +0000 Received: from localhost ([127.0.0.1]:36147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpTZP-0005TV-32 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 09:43:59 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpTZK-0005Ro-My for submit@debbugs.gnu.org; Wed, 27 Mar 2024 09:43:58 -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 1rpTZD-00013e-73 for guix-patches@gnu.org; Wed, 27 Mar 2024 09:43:47 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpTZB-0000tK-FV for guix-patches@gnu.org; Wed, 27 Mar 2024 09:43:46 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 7A1F427BBE2 for ; Wed, 27 Mar 2024 13:43:44 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cf371797 for ; Wed, 27 Mar 2024 13:43:43 +0000 (UTC) From: Christopher Baines Date: Wed, 27 Mar 2024 13:43:43 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 The aim here is to improve the user experience. There's anecdotal evidence that the network performance for bordeaux is better compared to ci at least for some users, and I don't know of any issues with rate limiting or access restriction for bordeaux compared to ci. It also has IPv6 support. Additionally, bordeaux generally had more substitutes than ci, particularly for aarch64-linux and armhf-linux. This change will offer a very slight speedup for those substitutes that only bordeaux has. Bordeaux has been a default substitute server for nearly 3 years now and I think this change is overdue. I'm also hopeful that we'll be able to build on the testing regarding mirrors for bordeaux, and that'll allow potentially improving the hosting setup (through providing more redundancy) and further improving substitute fetching for users who currently have issues with substitute access. * config-daemon.ac: Switch substitute urls order. * doc/guix.texi: Ditto. * etc/guix-install.sh: Ditto. * gnu/installer/newt/network.scm (wait-service-online): Ditto. * guix/store.scm (%default-substitute-urls): Ditto. Change-Id: I4f6d93ae1fc8b03d80b47b18b5749a51f1fde17b --- config-daemon.ac | 2 +- doc/guix.texi | 4 ++-- etc/guix-install.sh | 2 +- gnu/installer/newt/network.scm | 4 ++-- guix/scripts/substitute.scm | 4 ++-- guix/store.scm | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) base-commit: e9a547d2c57e22bea0b6da6cc67d423ff9d47b07 diff --git a/config-daemon.ac b/config-daemon.ac index 86306effe1..9188f93bda 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -106,7 +106,7 @@ if test "x$guix_build_daemon" = "xyes"; then dnl Determine the appropriate default list of substitute URLs (GnuTLS dnl is required so we can default to 'https'.) - guix_substitute_urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org" + guix_substitute_urls="https://bordeaux.guix.gnu.org https://ci.guix.gnu.org" AC_MSG_CHECKING([for default substitute URLs]) AC_MSG_RESULT([$guix_substitute_urls]) diff --git a/doc/guix.texi b/doc/guix.texi index ddd98a5fd4..ee3d5f5c3c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17,8 +17,8 @@ @set BASE-URL https://ftp.gnu.org/gnu/guix @c The official substitute server used by default. -@set SUBSTITUTE-SERVER-1 ci.guix.gnu.org -@set SUBSTITUTE-SERVER-2 bordeaux.guix.gnu.org +@set SUBSTITUTE-SERVER-1 bordeaux.guix.gnu.org +@set SUBSTITUTE-SERVER-2 ci.guix.gnu.org @set SUBSTITUTE-URLS https://@value{SUBSTITUTE-SERVER-1} https://@value{SUBSTITUTE-SERVER-2} @copying diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 982fb0a266..dde35e6d39 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -503,8 +503,8 @@ sys_enable_guix_daemon() sys_authorize_build_farms() { # authorize the public key(s) of the build farm(s) local hosts=( - ci.guix.gnu.org bordeaux.guix.gnu.org + ci.guix.gnu.org ) if prompt_yes_no "Permit downloading pre-built package binaries from the \ diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index ba26fc7c76..b22cc71305 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -127,8 +127,8 @@ (define (wait-service-online) (lambda _ #f)) (alarm 3)) (lambda () - (or (url-alive? "https://ci.guix.gnu.org") - (url-alive? "https://bordeaux.guix.gnu.org"))) + (or (url-alive? "https://bordeaux.guix.gnu.org") + (url-alive? "https://ci.guix.gnu.org"))) (lambda () (alarm 0)))) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 37cd08e289..90ce1be76c 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -749,8 +749,8 @@ (define %default-substitute-urls (#f ;; This can only happen when this script is not invoked by the ;; daemon. - '("http://ci.guix.gnu.org" - "http://bordeaux.guix.gnu.org")))) + '("http://bordeaux.guix.gnu.org" + "http://ci.guix.gnu.org")))) ;; In order to prevent using large number of discovered local substitute ;; servers, limit the local substitute urls list size. diff --git a/guix/store.scm b/guix/store.scm index 97c4f32a5b..1229198b09 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -767,8 +767,8 @@ (define %default-substitute-urls (map (if (false-if-exception (resolve-interface '(gnutls))) (cut string-append "https://" <>) (cut string-append "http://" <>)) - '("ci.guix.gnu.org" - "bordeaux.guix.gnu.org"))) + '("bordeaux.guix.gnu.org" + "ci.guix.gnu.org"))) (define (current-user-name) "Return the name of the calling user."