From unknown Tue Jun 17 22:25:14 2025 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) 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(-) 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." base-commit: e9a547d2c57e22bea0b6da6cc67d423ff9d47b07 -- 2.41.0 From unknown Tue Jun 17 22:25:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70028] [PATCH] Switch order of the default substitute servers. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 14:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: 70028@debbugs.gnu.org, zimon.toutoune@gmail.com, othacehe@gnu.org, ludo@gnu.org, me@tobias.gr, dev@jpoiret.xyz, guix@cbaines.net X-Debbugs-Original-Cc: 70028@debbugs.gnu.org, debbugs-submit@debbugs.gnu.org, Simon Tournier , Mathieu Othacehe , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Josselin Poiret , Christopher Baines Received: via spool by 70028-submit@debbugs.gnu.org id=B70028.171154948230765 (code B ref 70028); Wed, 27 Mar 2024 14:25:03 +0000 Received: (at 70028) by debbugs.gnu.org; 27 Mar 2024 14:24:42 +0000 Received: from localhost ([127.0.0.1]:38030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUCn-000807-Pb for submit@debbugs.gnu.org; Wed, 27 Mar 2024 10:24:42 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUCl-0007zV-Gx; Wed, 27 Mar 2024 10:24:40 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1711549469; cv=none; d=zohomail.com; s=zohoarc; b=OlkAF6mrKPB0QqG+IkGu940qLc5LIPg+n+PlKf3vctlSmcUcpc3+0Kn7qwHWeenooE4Uw8NmgADJx3IyMQmqy6v9P4kEc4U7GtOvOr/ZFarSPA1WxOkUGsbw6pKCrbAtp5I9Hin9rj1xcsH+t4qm7vQ1iOtgC4i6TsTF2uT+ejM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711549469; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=L4a4xxg/koMOnbrWpBFKkGB1jhN7FfD6EXI3a0AAa/0=; b=k7yurNJY8cEQbREC3fyE+1gNkgUuZvLTd0Ml2Ml57zHbs82rjv7qKEXXyYzQ45Gu+USsfMd5J6Pod8QODcf9NqdAdpwkckeXBX6KNM0UzsWYqNzXdwO948RF4RJsWgA8XFmqaSU90yI50kowzV8csMx7VocHD3w6hFL5nki3ZHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1711549469; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:In-reply-to:Message-ID:MIME-Version:Content-Type:Message-Id:Reply-To; bh=L4a4xxg/koMOnbrWpBFKkGB1jhN7FfD6EXI3a0AAa/0=; b=N9MKOTR71J3C2E7TSM7qT4Nm5SvAYCOJG+y+K3S/QERTNPn1yw8KyLDEaqSWiWof a4RrHI38lWdkB+WC5ykK5FMnfOy7WPQV8Afvh9JjrLDTlhjdu32KOXL7Acneec3M0dO Q8V5gxkAVeva89UZzrm9RZsDDwt3umjLOwjimJy4= Received: from localhost (196-110-142-46.pool.kielnet.net [46.142.110.196]) by mx.zohomail.com with SMTPS id 1711549467837426.92968430954795; Wed, 27 Mar 2024 07:24:27 -0700 (PDT) References: User-agent: mu4e 1.10.8; emacs 29.1 From: Ricardo Wurmus Date: Wed, 27 Mar 2024 15:24:08 +0100 In-reply-to: Message-ID: <87edbvbvmv.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Christopher Baines writes: > 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. LGTM -- Ricardo From unknown Tue Jun 17 22:25:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#70028] [PATCH] Switch order of the default substitute servers. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Apr 2024 15:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ricardo Wurmus Cc: 70028@debbugs.gnu.org, me@tobias.gr, zimon.toutoune@gmail.com, othacehe@gnu.org, mail@cbaines.net, dev@jpoiret.xyz, guix@cbaines.net X-Debbugs-Original-Cc: 70028@debbugs.gnu.org, Tobias Geerinckx-Rice , debbugs-submit@debbugs.gnu.org, Simon Tournier , Mathieu Othacehe , Christopher Baines , Josselin Poiret , Christopher Baines Received: via spool by 70028-submit@debbugs.gnu.org id=B70028.17120720982622 (code B ref 70028); Tue, 02 Apr 2024 15:35:02 +0000 Received: (at 70028) by debbugs.gnu.org; 2 Apr 2024 15:34:58 +0000 Received: from localhost ([127.0.0.1]:55018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrgA6-0000g3-0D for submit@debbugs.gnu.org; Tue, 02 Apr 2024 11:34:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrgA3-0000fA-Qf; Tue, 02 Apr 2024 11:34:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrg9t-0007WY-Cd; Tue, 02 Apr 2024 11:34:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=UYmstSETkpRJKjrjdXQjgjLiiyZhFms8ZDU+bF8hZJ0=; b=njGsMHX8o4HOZL9bXp9J /cHbCYZCQ9g1ukY6NctPcB11Py8luNyj6lhU9kJ//J+t1mFl4uMMpwG1LJkvjfZEpzyrRvI7vxukJ tSCztR9yR9XopoPGokZsk0qsvVQO1tXyOoQdEq2S7ywNLV5OIK2Ge0wmcj6OAp++SycD775ODlbun wol7uMAakohDX4KNMxqbcgzxyl1ACDdUaGRt8gt+t8F8ssGDG0ZIwakaAs6Px4cVm7ICR3Z4SAtaF rKlX8DjUhc/57vC3Cz559lNuRd1KjWrxhMBGGMVHMeAuOVahXY08DcutsyG61ze9tnVnssPhosEc6 1R+QPGy8otDKyw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <87edbvbvmv.fsf@elephly.net> (Ricardo Wurmus's message of "Wed, 27 Mar 2024 15:24:08 +0100") References: <87edbvbvmv.fsf@elephly.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Quartidi 14 Germinal an 232 de la =?UTF-8?Q?R=C3=A9volution,?= jour du =?UTF-8?Q?H=C3=AAtre?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 02 Apr 2024 17:34:40 +0200 Message-ID: <8734s34w33.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Ricardo Wurmus skribis: > Christopher Baines writes: > >> The aim here is to improve the user experience. There's anecdotal evide= nce >> that the network performance for bordeaux is better compared to ci at le= ast >> for some users, and I don't know of any issues with rate limiting or acc= ess >> restriction for bordeaux compared to ci. It also has IPv6 support. > > LGTM No objections from me. Note that it will take months to propagate to users, particularly users on foreign distros who rarely update the daemon IME. Thanks, Ludo=E2=80=99. From unknown Tue Jun 17 22:25:14 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Christopher Baines Subject: bug#70028: closed (Re: [bug#70028] [PATCH] Switch order of the default substitute servers.) Message-ID: References: <87bk6ql672.fsf@cbaines.net> X-Gnu-PR-Message: they-closed 70028 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 70028@debbugs.gnu.org Date: Wed, 03 Apr 2024 17:15:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1712164503-23870-1" This is a multi-part message in MIME format... ------------=_1712164503-23870-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #70028: [PATCH] Switch order of the default substitute servers. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 70028@debbugs.gnu.org. --=20 70028: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70028 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1712164503-23870-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 70028-done) by debbugs.gnu.org; 3 Apr 2024 17:14:21 +0000 Received: from localhost ([127.0.0.1]:59419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs4Bm-000687-Up for submit@debbugs.gnu.org; Wed, 03 Apr 2024 13:14:20 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rs4Bj-00067j-RE for 70028-done@debbugs.gnu.org; Wed, 03 Apr 2024 13:14:16 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 753E627BBE2; Wed, 3 Apr 2024 18:14:10 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 792c6eb9; Wed, 3 Apr 2024 17:14:09 +0000 (UTC) From: Christopher Baines To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#70028] [PATCH] Switch order of the default substitute servers. In-Reply-To: <8734s34w33.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Tue, 02 Apr 2024 17:34:40 +0200") References: <87edbvbvmv.fsf@elephly.net> <8734s34w33.fsf@gnu.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Wed, 03 Apr 2024 18:14:09 +0100 Message-ID: <87bk6ql672.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70028-done Cc: Ricardo Wurmus , 70028-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi, > > Ricardo Wurmus skribis: > >> Christopher Baines writes: >> >>> The aim here is to improve the user experience. There's anecdotal evid= ence >>> that the network performance for bordeaux is better compared to ci at l= east >>> for some users, and I don't know of any issues with rate limiting or ac= cess >>> restriction for bordeaux compared to ci. It also has IPv6 support. >> >> LGTM > > No objections from me. > > Note that it will take months to propagate to users, particularly users > on foreign distros who rarely update the daemon IME. Thanks both, I've pushed this to master as ac19e038b457d0585812091200005befd9b29259. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYNjmFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XduIA/9FaIdquirwMLe25g+7VjVRvjeRh9hfsXX VJr/cqG5/E9gcMxLmkYQ1kk9MLy+BlJUmRshZ8dsy9Uz6JtInhWZKqO4hQjpTdDZ 1w6C+RaLo3pjv3nPLSpVuwycEOEN44nCHrqxvrUb4nhm5E6DecrGpBjjAr9gtOt/ EOOpXu7EHd9uYj7Yub7LGn0c43C+Ahn6E4XlN8MTVw5Qw9+/HnARh/owo7znOs5H 3NjESRILeStHjKqbx3IkcrDpdAefXsNBzjiAw/ybPbJ+2UbFY7gOVMa77BdETxhs UhCqwER1Z487Fv7/7stkm4KejauMYsvRlqdWUieiJSODcOvJ7NvOHShfexW5mWoL yRvFA/49sJM9JDyYnF+WGhZ7D+0CUhYuN5KRXHXzUlYlJG2fMaEArrfOlOTQIesE d8nO3DeweioW47OnocN3JTOGYumYlnupJunuUOd1dM3zd13sv6z8d8DV6XLMzwte HWRS7PnagwqWdcauDee40s2qN3CWb8/3gE6WZn2l7b+Q9dXY9CCeArn7dis/8J3o rhYybToMUkLgNqNvkuefQgfvB7gJIMaQqgaUEoG96VCNlBYzq9taCSDdwVKWmFCb uK6wvQVBIm2gCw59E5HFBImdnrfg8jJmWxujelUhdzZzXTcWml6n5eG7bgO6TIam 3VD1CbKp6D0= =UmRS -----END PGP SIGNATURE----- --=-=-=-- ------------=_1712164503-23870-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] Switch order of the default substitute servers. Date: Wed, 27 Mar 2024 13:43:43 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) 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(-) 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." base-commit: e9a547d2c57e22bea0b6da6cc67d423ff9d47b07 -- 2.41.0 ------------=_1712164503-23870-1--