2016-12-30 23:22:27 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2019-01-07 10:57:18 +01:00
|
|
|
|
;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
2016-12-30 23:22:27 +01:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (guix ssh)
|
|
|
|
|
#:use-module (guix store)
|
2018-12-24 00:55:07 +01:00
|
|
|
|
#:use-module (guix inferior)
|
2017-11-19 22:45:06 +01:00
|
|
|
|
#:use-module (guix i18n)
|
2018-01-07 22:13:45 +01:00
|
|
|
|
#:use-module ((guix utils) #:select (&fix-hint))
|
2017-04-21 18:44:59 +02:00
|
|
|
|
#:use-module (ssh session)
|
|
|
|
|
#:use-module (ssh auth)
|
|
|
|
|
#:use-module (ssh key)
|
2016-12-30 23:22:27 +01:00
|
|
|
|
#:use-module (ssh channel)
|
|
|
|
|
#:use-module (ssh popen)
|
|
|
|
|
#:use-module (ssh session)
|
2018-01-12 22:32:52 +01:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2016-12-30 23:22:27 +01:00
|
|
|
|
#:use-module (srfi srfi-11)
|
2018-01-12 22:20:30 +01:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2016-12-31 18:34:17 +01:00
|
|
|
|
#:use-module (srfi srfi-34)
|
|
|
|
|
#:use-module (srfi srfi-35)
|
2016-12-30 23:22:27 +01:00
|
|
|
|
#:use-module (ice-9 match)
|
2016-12-31 18:34:17 +01:00
|
|
|
|
#:use-module (ice-9 binary-ports)
|
2017-04-21 18:44:59 +02:00
|
|
|
|
#:export (open-ssh-session
|
2018-12-24 00:55:07 +01:00
|
|
|
|
remote-inferior
|
2017-04-21 19:01:03 +02:00
|
|
|
|
remote-daemon-channel
|
2017-04-21 18:44:59 +02:00
|
|
|
|
connect-to-remote-daemon
|
2016-12-30 23:22:27 +01:00
|
|
|
|
send-files
|
|
|
|
|
retrieve-files
|
2018-01-12 22:20:30 +01:00
|
|
|
|
retrieve-files*
|
2018-01-12 23:16:53 +01:00
|
|
|
|
remote-store-host
|
|
|
|
|
|
|
|
|
|
report-guile-error
|
|
|
|
|
report-module-error))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; This module provides tools to support communication with remote stores
|
|
|
|
|
;;; over SSH, using Guile-SSH.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2017-04-21 18:44:59 +02:00
|
|
|
|
(define %compression
|
|
|
|
|
"zlib@openssh.com,zlib")
|
|
|
|
|
|
|
|
|
|
(define* (open-ssh-session host #:key user port
|
|
|
|
|
(compression %compression))
|
|
|
|
|
"Open an SSH session for HOST and return it. When USER and PORT are #f, use
|
|
|
|
|
default values or whatever '~/.ssh/config' specifies; otherwise use them.
|
|
|
|
|
Throw an error on failure."
|
|
|
|
|
(let ((session (make-session #:user user
|
|
|
|
|
#:host host
|
|
|
|
|
#:port port
|
|
|
|
|
#:timeout 10 ;seconds
|
|
|
|
|
;; #:log-verbosity 'protocol
|
|
|
|
|
|
|
|
|
|
;; We need lightweight compression when
|
|
|
|
|
;; exchanging full archives.
|
|
|
|
|
#:compression compression
|
|
|
|
|
#:compression-level 3)))
|
|
|
|
|
|
|
|
|
|
;; Honor ~/.ssh/config.
|
|
|
|
|
(session-parse-config! session)
|
|
|
|
|
|
|
|
|
|
(match (connect! session)
|
|
|
|
|
('ok
|
|
|
|
|
;; Use public key authentication, via the SSH agent if it's available.
|
|
|
|
|
(match (userauth-public-key/auto! session)
|
|
|
|
|
('success
|
|
|
|
|
session)
|
|
|
|
|
(x
|
|
|
|
|
(disconnect! session)
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&message
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(message (format #f (G_ "SSH authentication failed for '~a': ~a~%")
|
2017-04-21 18:44:59 +02:00
|
|
|
|
host (get-error session)))))))))
|
|
|
|
|
(x
|
|
|
|
|
;; Connection failed or timeout expired.
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&message
|
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match'
pattern for instance. See
<https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>.
* guix/ui.scm: Rename '_' to 'G_'.
* po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly.
* build-aux/compile-all.scm (warnings): Remove 'format'.
* gnu/packages.scm,
gnu/services.scm,
gnu/services/shepherd.scm,
gnu/system.scm,
gnu/system/shadow.scm,
guix/gnupg.scm,
guix/http-client.scm,
guix/import/cpan.scm,
guix/import/elpa.scm,
guix/import/pypi.scm,
guix/nar.scm,
guix/scripts.scm,
guix/scripts/archive.scm,
guix/scripts/authenticate.scm,
guix/scripts/build.scm,
guix/scripts/challenge.scm,
guix/scripts/container.scm,
guix/scripts/container/exec.scm,
guix/scripts/copy.scm,
guix/scripts/download.scm,
guix/scripts/edit.scm,
guix/scripts/environment.scm,
guix/scripts/gc.scm,
guix/scripts/graph.scm,
guix/scripts/hash.scm,
guix/scripts/import.scm,
guix/scripts/import/cpan.scm,
guix/scripts/import/cran.scm,
guix/scripts/import/crate.scm,
guix/scripts/import/elpa.scm,
guix/scripts/import/gem.scm,
guix/scripts/import/gnu.scm,
guix/scripts/import/hackage.scm,
guix/scripts/import/nix.scm,
guix/scripts/import/pypi.scm,
guix/scripts/import/stackage.scm,
guix/scripts/lint.scm,
guix/scripts/offload.scm,
guix/scripts/pack.scm,
guix/scripts/package.scm,
guix/scripts/perform-download.scm,
guix/scripts/publish.scm,
guix/scripts/pull.scm,
guix/scripts/refresh.scm,
guix/scripts/size.scm,
guix/scripts/substitute.scm,
guix/scripts/system.scm,
guix/ssh.scm,
guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was
obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
2017-05-03 15:57:02 +02:00
|
|
|
|
(message (format #f (G_ "SSH connection to '~a' failed: ~a~%")
|
2017-04-21 18:44:59 +02:00
|
|
|
|
host (get-error session))))))))))
|
|
|
|
|
|
2018-12-24 00:55:07 +01:00
|
|
|
|
(define (remote-inferior session)
|
|
|
|
|
"Return a remote inferior for the given SESSION."
|
|
|
|
|
(let ((pipe (open-remote-pipe* session OPEN_BOTH
|
|
|
|
|
"guix" "repl" "-t" "machine")))
|
|
|
|
|
(port->inferior pipe)))
|
|
|
|
|
|
offload: Use (guix inferior) instead of (ssh dist node).
Using inferiors and thus 'guix repl' simplifies setup on build
machines (no need to worry about GUILE_LOAD_PATH etc.)
Furthermore, the 'guix repl -t machine' protocol running in a remote
pipe addresses several issues with the current implementation of nodes
and RREPLs in Guile-SSH: fewer round trips, doesn't leave a 'guile
--listen' process behind it, stateless (since a new process is started
each time), more efficient (the SSH channel can be reused), more
reliable (no 'pgrep', 'pkill', and shellology; see
<https://github.com/artyom-poptsov/guile-ssh/issues/11> as an example.)
* guix/ssh.scm (inferior-remote-eval): New procedure.
(send-files): Use it instead of 'make-node' and 'node-eval'.
* guix/scripts/offload.scm (node-guile-version): New procedure.
(node-free-disk-space, transfer-and-offload, node-load)
(choose-build-machine, assert-node-has-guix): Use 'remote-inferior'
instead of 'make-node' and 'inferior-eval' instead of 'node-eval'.
(assert-node-can-import, assert-node-can-export): Likewise, and add
'session' parameter.
(check-machine-availability): Likewise, and add calls to
'close-inferior' and 'disconnect!'.
(check-machine-status): Likewise.
* doc/guix.texi (Daemon Offload Setup): Remove bit related to 'guile' in
$PATH and $GUILE_LOAD_PATH; mention 'guix' alone.
2018-12-24 15:40:04 +01:00
|
|
|
|
(define (inferior-remote-eval exp session)
|
|
|
|
|
"Evaluate EXP in a new inferior running in SESSION, and close the inferior
|
|
|
|
|
right away."
|
|
|
|
|
(let ((inferior (remote-inferior session)))
|
|
|
|
|
(dynamic-wind
|
|
|
|
|
(const #t)
|
|
|
|
|
(lambda ()
|
|
|
|
|
(inferior-eval exp inferior))
|
|
|
|
|
(lambda ()
|
|
|
|
|
;; Close INFERIOR right away to prevent finalization from happening in
|
|
|
|
|
;; another thread at the wrong time (see
|
|
|
|
|
;; <https://bugs.gnu.org/26976>.)
|
|
|
|
|
(close-inferior inferior)))))
|
|
|
|
|
|
2017-04-21 19:01:03 +02:00
|
|
|
|
(define* (remote-daemon-channel session
|
|
|
|
|
#:optional
|
|
|
|
|
(socket-name
|
|
|
|
|
"/var/guix/daemon-socket/socket"))
|
|
|
|
|
"Return an input/output port (an SSH channel) to the daemon at SESSION."
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(define redirect
|
|
|
|
|
;; Code run in SESSION to redirect the remote process' stdin/stdout to the
|
|
|
|
|
;; daemon's socket, à la socat. The SSH protocol supports forwarding to
|
|
|
|
|
;; Unix-domain sockets but libssh doesn't have an API for that, hence this
|
|
|
|
|
;; hack.
|
|
|
|
|
`(begin
|
2018-01-10 17:52:23 +01:00
|
|
|
|
(use-modules (ice-9 match) (rnrs io ports)
|
2018-01-12 23:32:25 +01:00
|
|
|
|
(rnrs bytevectors))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
2018-02-07 22:31:48 +01:00
|
|
|
|
(let ((sock (socket AF_UNIX SOCK_STREAM 0))
|
|
|
|
|
(stdin (current-input-port))
|
|
|
|
|
(stdout (current-output-port))
|
|
|
|
|
(select* (lambda (read write except)
|
|
|
|
|
;; This is a workaround for
|
|
|
|
|
;; <https://bugs.gnu.org/30365> in Guile < 2.2.4:
|
|
|
|
|
;; since 'select' sometimes returns non-empty sets for
|
|
|
|
|
;; no good reason, call 'select' a second time with a
|
|
|
|
|
;; zero timeout to filter out incorrect replies.
|
|
|
|
|
(match (select read write except)
|
|
|
|
|
((read write except)
|
|
|
|
|
(select read write except 0))))))
|
2019-01-07 10:57:18 +01:00
|
|
|
|
(setvbuf stdout 'none)
|
2018-01-12 23:32:25 +01:00
|
|
|
|
|
|
|
|
|
;; Use buffered ports so that 'get-bytevector-some' returns up to the
|
|
|
|
|
;; whole buffer like read(2) would--see <https://bugs.gnu.org/30066>.
|
2019-01-07 10:57:18 +01:00
|
|
|
|
(setvbuf stdin 'block 65536)
|
|
|
|
|
(setvbuf sock 'block 65536)
|
2018-01-12 23:32:25 +01:00
|
|
|
|
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(connect sock AF_UNIX ,socket-name)
|
|
|
|
|
|
|
|
|
|
(let loop ()
|
2018-02-07 22:31:48 +01:00
|
|
|
|
(match (select* (list stdin sock) '() '())
|
2018-01-10 23:06:08 +01:00
|
|
|
|
((reads () ())
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(when (memq stdin reads)
|
2018-01-12 23:32:25 +01:00
|
|
|
|
(match (get-bytevector-some stdin)
|
|
|
|
|
((? eof-object?)
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(primitive-exit 0))
|
2018-01-12 23:32:25 +01:00
|
|
|
|
(bv
|
|
|
|
|
(put-bytevector sock bv)
|
|
|
|
|
(force-output sock))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(when (memq sock reads)
|
2018-01-12 23:32:25 +01:00
|
|
|
|
(match (get-bytevector-some sock)
|
|
|
|
|
((? eof-object?)
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(primitive-exit 0))
|
2018-01-12 23:32:25 +01:00
|
|
|
|
(bv
|
|
|
|
|
(put-bytevector stdout bv))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(loop))
|
|
|
|
|
(_
|
|
|
|
|
(primitive-exit 1)))))))
|
|
|
|
|
|
2017-04-21 19:01:03 +02:00
|
|
|
|
(open-remote-pipe* session OPEN_BOTH
|
|
|
|
|
;; Sort-of shell-quote REDIRECT.
|
|
|
|
|
"guile" "-c"
|
|
|
|
|
(object->string
|
|
|
|
|
(object->string redirect))))
|
|
|
|
|
|
|
|
|
|
(define* (connect-to-remote-daemon session
|
|
|
|
|
#:optional
|
|
|
|
|
(socket-name
|
|
|
|
|
"/var/guix/daemon-socket/socket"))
|
|
|
|
|
"Connect to the remote build daemon listening on SOCKET-NAME over SESSION,
|
|
|
|
|
an SSH session. Return a <nix-server> object."
|
2018-11-05 06:01:47 +01:00
|
|
|
|
(open-connection #:port (remote-daemon-channel session socket-name)))
|
2017-04-21 19:01:03 +02:00
|
|
|
|
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
|
|
|
|
(define (store-import-channel session)
|
|
|
|
|
"Return an output port to which archives to be exported to SESSION's store
|
|
|
|
|
can be written."
|
|
|
|
|
;; Using the 'import-paths' RPC on a remote store would be slow because it
|
|
|
|
|
;; makes a round trip every time 32 KiB have been transferred. This
|
|
|
|
|
;; procedure instead opens a separate channel to use the remote
|
|
|
|
|
;; 'import-paths' procedure, which consumes all the data in a single round
|
2017-06-04 22:53:40 +02:00
|
|
|
|
;; trip. This optimizes the successful case at the expense of error
|
|
|
|
|
;; conditions: errors can only be reported once all the input has been
|
|
|
|
|
;; consumed.
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(define import
|
|
|
|
|
`(begin
|
2017-06-04 22:53:40 +02:00
|
|
|
|
(use-modules (guix) (srfi srfi-34)
|
|
|
|
|
(rnrs io ports) (rnrs bytevectors))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
2017-06-04 22:53:40 +02:00
|
|
|
|
(define (consume-input port)
|
|
|
|
|
(let ((bv (make-bytevector 32768)))
|
|
|
|
|
(let loop ()
|
|
|
|
|
(let ((n (get-bytevector-n! port bv 0
|
|
|
|
|
(bytevector-length bv))))
|
|
|
|
|
(unless (eof-object? n)
|
|
|
|
|
(loop))))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
2017-06-04 22:53:40 +02:00
|
|
|
|
;; Upon completion, write an sexp that denotes the status.
|
|
|
|
|
(write
|
|
|
|
|
(catch #t
|
|
|
|
|
(lambda ()
|
|
|
|
|
(guard (c ((nix-protocol-error? c)
|
|
|
|
|
;; Consume all the input since the only time we can
|
|
|
|
|
;; report the error is after everything has been
|
|
|
|
|
;; consumed.
|
|
|
|
|
(consume-input (current-input-port))
|
|
|
|
|
(list 'protocol-error (nix-protocol-error-message c))))
|
|
|
|
|
(with-store store
|
2019-01-07 10:57:18 +01:00
|
|
|
|
(setvbuf (current-input-port) 'none)
|
2017-06-04 22:53:40 +02:00
|
|
|
|
(import-paths store (current-input-port))
|
|
|
|
|
'(success))))
|
|
|
|
|
(lambda args
|
|
|
|
|
(cons 'error args))))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
2017-06-04 22:53:40 +02:00
|
|
|
|
(open-remote-pipe session
|
|
|
|
|
(string-join
|
|
|
|
|
`("guile" "-c"
|
|
|
|
|
,(object->string (object->string import))))
|
|
|
|
|
OPEN_BOTH))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
2016-12-31 18:13:29 +01:00
|
|
|
|
(define* (store-export-channel session files
|
|
|
|
|
#:key recursive?)
|
2016-12-30 23:22:27 +01:00
|
|
|
|
"Return an input port from which an export of FILES from SESSION's store can
|
2016-12-31 18:13:29 +01:00
|
|
|
|
be read. When RECURSIVE? is true, the closure of FILES is exported."
|
2016-12-30 23:22:27 +01:00
|
|
|
|
;; Same as above: this is more efficient than calling 'export-paths' on a
|
|
|
|
|
;; remote store.
|
|
|
|
|
(define export
|
|
|
|
|
`(begin
|
2018-01-07 22:13:45 +01:00
|
|
|
|
(eval-when (load expand eval)
|
|
|
|
|
(unless (resolve-module '(guix) #:ensure #f)
|
|
|
|
|
(write `(module-error))
|
|
|
|
|
(exit 7)))
|
|
|
|
|
|
|
|
|
|
(use-modules (guix) (srfi srfi-1)
|
|
|
|
|
(srfi srfi-26) (srfi srfi-34))
|
|
|
|
|
|
|
|
|
|
(guard (c ((nix-connection-error? c)
|
|
|
|
|
(write `(connection-error ,(nix-connection-error-file c)
|
|
|
|
|
,(nix-connection-error-code c))))
|
|
|
|
|
((nix-protocol-error? c)
|
|
|
|
|
(write `(protocol-error ,(nix-protocol-error-status c)
|
|
|
|
|
,(nix-protocol-error-message c))))
|
|
|
|
|
(else
|
|
|
|
|
(write `(exception))))
|
|
|
|
|
(with-store store
|
|
|
|
|
(let* ((files ',files)
|
|
|
|
|
(invalid (remove (cut valid-path? store <>)
|
|
|
|
|
files)))
|
|
|
|
|
(unless (null? invalid)
|
|
|
|
|
(write `(invalid-items ,invalid))
|
|
|
|
|
(exit 1))
|
|
|
|
|
|
2018-01-12 22:32:52 +01:00
|
|
|
|
;; TODO: When RECURSIVE? is true, we could send the list of store
|
|
|
|
|
;; items in the closure so that the other end can filter out
|
|
|
|
|
;; those it already has.
|
|
|
|
|
|
2018-01-07 22:13:45 +01:00
|
|
|
|
(write '(exporting)) ;we're ready
|
|
|
|
|
(force-output)
|
|
|
|
|
|
2019-01-07 10:57:18 +01:00
|
|
|
|
(setvbuf (current-output-port) 'none)
|
2018-01-07 22:13:45 +01:00
|
|
|
|
(export-paths store files (current-output-port)
|
|
|
|
|
#:recursive? ,recursive?))))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
|
|
|
|
(open-remote-input-pipe session
|
|
|
|
|
(string-join
|
|
|
|
|
`("guile" "-c"
|
|
|
|
|
,(object->string
|
|
|
|
|
(object->string export))))))
|
|
|
|
|
|
|
|
|
|
(define* (send-files local files remote
|
2016-12-31 18:13:29 +01:00
|
|
|
|
#:key
|
|
|
|
|
recursive?
|
|
|
|
|
(log-port (current-error-port)))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
"Send the subset of FILES from LOCAL (a local store) that's missing to
|
2016-12-31 18:32:15 +01:00
|
|
|
|
REMOTE, a remote store. When RECURSIVE? is true, send the closure of FILES.
|
|
|
|
|
Return the list of store items actually sent."
|
2016-12-30 23:22:27 +01:00
|
|
|
|
;; Compute the subset of FILES missing on SESSION and send them.
|
2016-12-31 18:13:29 +01:00
|
|
|
|
(let* ((files (if recursive? (requisites local files) files))
|
|
|
|
|
(session (channel-get-session (nix-server-socket remote)))
|
offload: Use (guix inferior) instead of (ssh dist node).
Using inferiors and thus 'guix repl' simplifies setup on build
machines (no need to worry about GUILE_LOAD_PATH etc.)
Furthermore, the 'guix repl -t machine' protocol running in a remote
pipe addresses several issues with the current implementation of nodes
and RREPLs in Guile-SSH: fewer round trips, doesn't leave a 'guile
--listen' process behind it, stateless (since a new process is started
each time), more efficient (the SSH channel can be reused), more
reliable (no 'pgrep', 'pkill', and shellology; see
<https://github.com/artyom-poptsov/guile-ssh/issues/11> as an example.)
* guix/ssh.scm (inferior-remote-eval): New procedure.
(send-files): Use it instead of 'make-node' and 'node-eval'.
* guix/scripts/offload.scm (node-guile-version): New procedure.
(node-free-disk-space, transfer-and-offload, node-load)
(choose-build-machine, assert-node-has-guix): Use 'remote-inferior'
instead of 'make-node' and 'inferior-eval' instead of 'node-eval'.
(assert-node-can-import, assert-node-can-export): Likewise, and add
'session' parameter.
(check-machine-availability): Likewise, and add calls to
'close-inferior' and 'disconnect!'.
(check-machine-status): Likewise.
* doc/guix.texi (Daemon Offload Setup): Remove bit related to 'guile' in
$PATH and $GUILE_LOAD_PATH; mention 'guix' alone.
2018-12-24 15:40:04 +01:00
|
|
|
|
(missing (inferior-remote-eval
|
|
|
|
|
`(begin
|
|
|
|
|
(use-modules (guix)
|
|
|
|
|
(srfi srfi-1) (srfi srfi-26))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
offload: Use (guix inferior) instead of (ssh dist node).
Using inferiors and thus 'guix repl' simplifies setup on build
machines (no need to worry about GUILE_LOAD_PATH etc.)
Furthermore, the 'guix repl -t machine' protocol running in a remote
pipe addresses several issues with the current implementation of nodes
and RREPLs in Guile-SSH: fewer round trips, doesn't leave a 'guile
--listen' process behind it, stateless (since a new process is started
each time), more efficient (the SSH channel can be reused), more
reliable (no 'pgrep', 'pkill', and shellology; see
<https://github.com/artyom-poptsov/guile-ssh/issues/11> as an example.)
* guix/ssh.scm (inferior-remote-eval): New procedure.
(send-files): Use it instead of 'make-node' and 'node-eval'.
* guix/scripts/offload.scm (node-guile-version): New procedure.
(node-free-disk-space, transfer-and-offload, node-load)
(choose-build-machine, assert-node-has-guix): Use 'remote-inferior'
instead of 'make-node' and 'inferior-eval' instead of 'node-eval'.
(assert-node-can-import, assert-node-can-export): Likewise, and add
'session' parameter.
(check-machine-availability): Likewise, and add calls to
'close-inferior' and 'disconnect!'.
(check-machine-status): Likewise.
* doc/guix.texi (Daemon Offload Setup): Remove bit related to 'guile' in
$PATH and $GUILE_LOAD_PATH; mention 'guix' alone.
2018-12-24 15:40:04 +01:00
|
|
|
|
(with-store store
|
|
|
|
|
(remove (cut valid-path? store <>)
|
|
|
|
|
',files)))
|
|
|
|
|
session))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(count (length missing))
|
2018-07-29 15:19:55 +02:00
|
|
|
|
(sizes (map (lambda (item)
|
|
|
|
|
(path-info-nar-size (query-path-info local item)))
|
|
|
|
|
missing))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(port (store-import-channel session)))
|
2018-07-29 15:19:55 +02:00
|
|
|
|
(format log-port (N_ "sending ~a store item (~h MiB) to '~a'...~%"
|
|
|
|
|
"sending ~a store items (~h MiB) to '~a'...~%" count)
|
|
|
|
|
count
|
|
|
|
|
(inexact->exact (round (/ (reduce + 0 sizes) (expt 2. 20))))
|
|
|
|
|
(session-get session 'host))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
|
|
|
|
;; Send MISSING in topological order.
|
|
|
|
|
(export-paths local missing port)
|
|
|
|
|
|
|
|
|
|
;; Tell the remote process that we're done. (In theory the end-of-archive
|
|
|
|
|
;; mark of 'export-paths' would be enough, but in practice it's not.)
|
|
|
|
|
(channel-send-eof port)
|
|
|
|
|
|
2017-06-04 22:53:40 +02:00
|
|
|
|
;; Wait for completion of the remote process and read the status sexp from
|
2018-11-24 19:38:55 +01:00
|
|
|
|
;; PORT. Wait for the exit status only when 'read' completed; otherwise,
|
|
|
|
|
;; we might wait forever if the other end is stuck.
|
2017-06-04 22:53:40 +02:00
|
|
|
|
(let* ((result (false-if-exception (read port)))
|
2018-11-24 19:38:55 +01:00
|
|
|
|
(status (and result
|
|
|
|
|
(zero? (channel-get-exit-status port)))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(close-port port)
|
2017-06-04 22:53:40 +02:00
|
|
|
|
(match result
|
|
|
|
|
(('success . _)
|
|
|
|
|
missing)
|
|
|
|
|
(('protocol-error message)
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&nix-protocol-error (message message) (status 42)))))
|
|
|
|
|
(('error key args ...)
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&nix-protocol-error
|
|
|
|
|
(message (call-with-output-string
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(print-exception port #f key args))))
|
|
|
|
|
(status 43)))))
|
|
|
|
|
(_
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&nix-protocol-error
|
|
|
|
|
(message "unknown error while sending files over SSH")
|
|
|
|
|
(status 44)))))))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
|
|
|
|
(define (remote-store-session remote)
|
|
|
|
|
"Return the SSH channel beneath REMOTE, a remote store as returned by
|
|
|
|
|
'connect-to-remote-daemon', or #f."
|
|
|
|
|
(channel-get-session (nix-server-socket remote)))
|
|
|
|
|
|
|
|
|
|
(define (remote-store-host remote)
|
|
|
|
|
"Return the name of the host REMOTE is connected to, where REMOTE is a
|
|
|
|
|
remote store as returned by 'connect-to-remote-daemon'."
|
|
|
|
|
(match (remote-store-session remote)
|
|
|
|
|
(#f #f)
|
|
|
|
|
((? session? session)
|
|
|
|
|
(session-get session 'host))))
|
|
|
|
|
|
2016-12-31 18:13:29 +01:00
|
|
|
|
(define* (file-retrieval-port files remote
|
|
|
|
|
#:key recursive?)
|
2016-12-30 23:22:27 +01:00
|
|
|
|
"Return an input port from which to retrieve FILES (a list of store items)
|
|
|
|
|
from REMOTE, along with the number of items to retrieve (lower than or equal
|
|
|
|
|
to the length of FILES.)"
|
2016-12-31 18:13:29 +01:00
|
|
|
|
(values (store-export-channel (remote-store-session remote) files
|
|
|
|
|
#:recursive? recursive?)
|
|
|
|
|
(length files))) ;XXX: inaccurate when RECURSIVE? is true
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
2018-01-07 22:13:45 +01:00
|
|
|
|
(define-syntax raise-error
|
|
|
|
|
(syntax-rules (=>)
|
|
|
|
|
((_ fmt args ... (=> hint-fmt hint-args ...))
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&message
|
|
|
|
|
(message (format #f fmt args ...)))
|
|
|
|
|
(&fix-hint
|
|
|
|
|
(hint (format #f hint-fmt hint-args ...))))))
|
|
|
|
|
((_ fmt args ...)
|
|
|
|
|
(raise (condition
|
|
|
|
|
(&message
|
|
|
|
|
(message (format #f fmt args ...))))))))
|
|
|
|
|
|
2018-01-12 22:20:30 +01:00
|
|
|
|
(define* (retrieve-files* files remote
|
|
|
|
|
#:key recursive? (log-port (current-error-port))
|
|
|
|
|
(import (const #f)))
|
|
|
|
|
"Pass IMPORT an input port from which to read the sequence of FILES coming
|
|
|
|
|
from REMOTE. When RECURSIVE? is true, retrieve the closure of FILES."
|
2016-12-30 23:22:27 +01:00
|
|
|
|
(let-values (((port count)
|
2016-12-31 18:13:29 +01:00
|
|
|
|
(file-retrieval-port files remote
|
|
|
|
|
#:recursive? recursive?)))
|
2018-01-07 22:13:45 +01:00
|
|
|
|
(match (read port) ;read the initial status
|
|
|
|
|
(('exporting)
|
|
|
|
|
(format #t (N_ "retrieving ~a store item from '~a'...~%"
|
|
|
|
|
"retrieving ~a store items from '~a'...~%" count)
|
|
|
|
|
count (remote-store-host remote))
|
|
|
|
|
|
2018-01-12 22:20:30 +01:00
|
|
|
|
(dynamic-wind
|
|
|
|
|
(const #t)
|
|
|
|
|
(lambda ()
|
|
|
|
|
(import port))
|
|
|
|
|
(lambda ()
|
|
|
|
|
(close-port port))))
|
2018-01-07 22:13:45 +01:00
|
|
|
|
((? eof-object?)
|
2018-01-12 23:16:53 +01:00
|
|
|
|
(report-guile-error (remote-store-host remote)))
|
2018-01-07 22:13:45 +01:00
|
|
|
|
(('module-error . _)
|
2018-01-12 23:16:53 +01:00
|
|
|
|
(report-module-error (remote-store-host remote)))
|
2018-01-07 22:13:45 +01:00
|
|
|
|
(('connection-error file code . _)
|
|
|
|
|
(raise-error (G_ "failed to connect to '~A' on remote host '~A': ~a")
|
|
|
|
|
file (remote-store-host remote) (strerror code)))
|
|
|
|
|
(('invalid-items items . _)
|
|
|
|
|
(raise-error (N_ "no such item on remote host '~A':~{ ~a~}"
|
|
|
|
|
"no such items on remote host '~A':~{ ~a~}"
|
|
|
|
|
(length items))
|
|
|
|
|
(remote-store-host remote) items))
|
|
|
|
|
(('protocol-error status message . _)
|
|
|
|
|
(raise-error (G_ "protocol error on remote host '~A': ~a")
|
|
|
|
|
(remote-store-host remote) message))
|
|
|
|
|
(_
|
|
|
|
|
(raise-error (G_ "failed to retrieve store items from '~a'")
|
|
|
|
|
(remote-store-host remote))))))
|
2016-12-30 23:22:27 +01:00
|
|
|
|
|
2018-01-12 22:20:30 +01:00
|
|
|
|
(define* (retrieve-files local files remote
|
|
|
|
|
#:key recursive? (log-port (current-error-port)))
|
|
|
|
|
"Retrieve FILES from REMOTE and import them using the 'import-paths' RPC on
|
|
|
|
|
LOCAL. When RECURSIVE? is true, retrieve the closure of FILES."
|
2018-01-12 22:32:52 +01:00
|
|
|
|
(retrieve-files* (remove (cut valid-path? local <>) files)
|
|
|
|
|
remote
|
2018-01-12 22:20:30 +01:00
|
|
|
|
#:recursive? recursive?
|
|
|
|
|
#:log-port log-port
|
|
|
|
|
#:import (lambda (port)
|
|
|
|
|
(import-paths local port))))
|
|
|
|
|
|
2018-01-12 23:16:53 +01:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Error reporting.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (report-guile-error host)
|
|
|
|
|
(raise-error (G_ "failed to start Guile on remote host '~A'") host
|
|
|
|
|
(=> (G_ "Make sure @command{guile} can be found in
|
|
|
|
|
@code{$PATH} on the remote host. Run @command{ssh ~A guile --version} to
|
|
|
|
|
check.")
|
|
|
|
|
host)))
|
|
|
|
|
|
|
|
|
|
(define (report-module-error host)
|
|
|
|
|
"Report an error about missing Guix modules on HOST."
|
|
|
|
|
;; TRANSLATORS: Leave "Guile" untranslated.
|
|
|
|
|
(raise-error (G_ "Guile modules not found on remote host '~A'") host
|
|
|
|
|
(=> (G_ "Make sure @code{GUILE_LOAD_PATH} includes Guix'
|
|
|
|
|
own module directory. Run @command{ssh ~A env | grep GUILE_LOAD_PATH} to
|
|
|
|
|
check.")
|
|
|
|
|
host)))
|
|
|
|
|
|
2016-12-30 23:22:27 +01:00
|
|
|
|
;;; ssh.scm ends here
|