From patchwork Sun Dec 6 22:04:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 25614 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 D147B27BC02; Sun, 6 Dec 2020 22:05:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2139F27BC00 for ; Sun, 6 Dec 2020 22:05:26 +0000 (GMT) Received: from localhost ([::1]:33718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1km29l-0001Ka-7N for patchwork@mira.cbaines.net; Sun, 06 Dec 2020 17:05:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1km29O-0001K0-S0 for guix-patches@gnu.org; Sun, 06 Dec 2020 17:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1km29O-0003Jf-Ky for guix-patches@gnu.org; Sun, 06 Dec 2020 17:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1km29O-0006Ri-Fw for guix-patches@gnu.org; Sun, 06 Dec 2020 17:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45018] [PATCH v2 0/6] Process and connection reuse for substitutions Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Dec 2020 22:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45018 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45018@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 45018-submit@debbugs.gnu.org id=B45018.160729227324655 (code B ref 45018); Sun, 06 Dec 2020 22:05:02 +0000 Received: (at 45018) by debbugs.gnu.org; 6 Dec 2020 22:04:33 +0000 Received: from localhost ([127.0.0.1]:51567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1km28v-0006Pb-KV for submit@debbugs.gnu.org; Sun, 06 Dec 2020 17:04:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1km28u-0006PO-3R for 45018@debbugs.gnu.org; Sun, 06 Dec 2020 17:04:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44336) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1km28o-0003A4-8B; Sun, 06 Dec 2020 17:04:26 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45440 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1km28n-00020D-6A; Sun, 06 Dec 2020 17:04:26 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 6 Dec 2020 23:04:09 +0100 Message-Id: <20201206220415.23279-1-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <87o8janf50.fsf@gnu.org> References: <87o8janf50.fsf@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches Hello! This update fixes issues that Chris uncovered during testing and addresses comments Mathieu made. Changes since v1: 1. The daemon, in ‘SubstitutionGoal::handleChildOutput’, properly deal with the case where ‘data’ contains several lines, such as a “sha256:…” line and a “success” line. 2. ‘call-with-cached-connection’ catches exceptions that may be raised by (web response) when reusing a stale socket. 3. The connection cache is now an alist instead of a hash table and care is taken to evict old entries once it has reached ‘%max-cached-connections’. 4. Fixed typo in comment in (guix scripts substitute). I’ll go ahead with this version soonish if there are no objections. Ludo’. Ludovic Courtès (6): daemon: 'Agent' constructor takes a list of environment variables. daemon: Use 'Agent' to spawn 'guix substitute --query'. daemon: Factorize substituter agent spawning. daemon: Run 'guix substitute --substitute' as an agent. substitute: Cache and reuse connections while substituting. daemon: Raise an error if substituter doesn't send the expected hash. guix/http-client.scm | 12 +- guix/progress.scm | 8 +- guix/scripts/substitute.scm | 243 ++++++++++++++++++++++++------------ nix/libstore/build.cc | 173 +++++++++++++------------ nix/libstore/local-store.cc | 170 ++++++------------------- nix/libstore/local-store.hh | 25 +--- nix/libutil/util.cc | 6 +- nix/libutil/util.hh | 7 +- tests/substitute.scm | 98 +++++++++------ 9 files changed, 381 insertions(+), 361 deletions(-)