[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
49/96: ssh: Silence remote daemon messages when sending store items.
From: |
guix-commits |
Subject: |
49/96: ssh: Silence remote daemon messages when sending store items. |
Date: |
Wed, 19 Apr 2023 21:41:12 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 6d6add5f8f00f9d5dbb473485952d3fbb3275697
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Apr 17 22:28:01 2023 +0200
ssh: Silence remote daemon messages when sending store items.
Fixes <https://issues.guix.gnu.org/61839>.
Previously, when running 'guix-daemon --debug' on the remote machine,
lots of debugging outputs would be printed to stderr; since the client
wouldn't read it, we could eventually reach a deadlock where the 'guix
repl' process would be stuck writing to stderr while the client is
stuck waiting on its stdout.
* guix/ssh.scm (store-import-channel)[import]: Parameterize
'current-build-output-port'.
---
guix/ssh.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/guix/ssh.scm b/guix/ssh.scm
index 5b35f664d9..b7b9807ebf 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2021 Ludovic Courtès
<ludo@gnu.org>
+;;; Copyright © 2016-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -367,7 +367,15 @@ can be written."
(force-output)
(setvbuf (current-input-port) 'none)
+
+ ;; If 'guix-daemon' is running with '--debug', a lot of
+ ;; debugging info goes to 'current-build-output-port' (stderr
+ ;; by default). However, since nobody's reading it, this
+ ;; could lead to a deadlock. Thus, disable debugging output.
+ (set-build-options store #:verbosity 0)
+
(import-paths store (current-input-port))
+
'(success))))
(lambda args
(cons 'error args))))
- 40/96: gnu: python-scikit-build: Update to 0.17.1., (continued)
- 40/96: gnu: python-scikit-build: Update to 0.17.1., guix-commits, 2023/04/19
- 41/96: gnu: python-fonttools: Update to 4.39.3., guix-commits, 2023/04/19
- 57/96: snippets: tempel: Simplify git-commit-mode detection., guix-commits, 2023/04/19
- 62/96: gnu: texlive-latex-acronym: Replace with texlive-acronym., guix-commits, 2023/04/19
- 64/96: gnu: texlive-latex-lastpage: Replace with texlive-lastpage., guix-commits, 2023/04/19
- 37/96: gnu: python-pytest-trio: Update to 0.8.0., guix-commits, 2023/04/19
- 44/96: gnu: python-anyio: Update to 3.6.2., guix-commits, 2023/04/19
- 46/96: environment: Really auto-load (guix scripts pack)., guix-commits, 2023/04/19
- 47/96: services: agetty: 'term-console' succeeds by default., guix-commits, 2023/04/19
- 48/96: substitute: Download nar from another server upon ETIMEDOUT., guix-commits, 2023/04/19
- 49/96: ssh: Silence remote daemon messages when sending store items.,
guix-commits <=
- 54/96: gnu: audacity: Update to 3.3.0-beta-1., guix-commits, 2023/04/19
- 58/96: gnu: r-with-tests: Update to 4.2.3., guix-commits, 2023/04/19
- 60/96: gnu: Add texlive-relsize., guix-commits, 2023/04/19
- 65/96: gnu: Add texlive-totpages., guix-commits, 2023/04/19
- 66/96: gnu: emacs-autothemer: Update to 0.2.17., guix-commits, 2023/04/19
- 75/96: gnu: kwin: Update skipped test list., guix-commits, 2023/04/19
- 78/96: gnu: r-rhdf5: Update to 2.42.1., guix-commits, 2023/04/19
- 84/96: gnu: r-dmrseq: Update to 1.18.1., guix-commits, 2023/04/19
- 89/96: tests: guix-system: Drop the i686-linux desktop image test., guix-commits, 2023/04/19
- 95/96: gnu: borgmatic: Update to 1.7.12., guix-commits, 2023/04/19