nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

offload: Make the compression methods configurable. 

* guix/scripts/offload.scm (<build-machine>)[compression]
[compression-level]: New fields.
(open-ssh-session): Honor them.
* doc/guix.texi (Daemon Offload Setup): Document them.
This commit is contained in:
Ludovic Courtès 2016-12-05 23:15:17 +01:00
parent 067a2e2de9
commit 1d48cf948c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/guix.texi
View File

@ -921,6 +921,13 @@ Port number of SSH server on the machine.
The SSH private key file to use when connecting to the machine, in The SSH private key file to use when connecting to the machine, in
OpenSSH format. OpenSSH format.
@item @code{compression} (default: @code{"zlib@@openssh.com,zlib"})
@itemx @code{compression-level} (default: @code{3})
The SSH-level compression methods and compression level requested.
Note that offloading relies on SSH compression to reduce bandwidth usage
when transferring files to and from build machines.
@item @code{daemon-socket} (default: @code{"/var/guix/daemon-socket/socket"}) @item @code{daemon-socket} (default: @code{"/var/guix/daemon-socket/socket"})
File name of the Unix-domain socket @command{guix-daemon} is listening File name of the Unix-domain socket @command{guix-daemon} is listening
to on that machine. to on that machine.

10
guix/scripts/offload.scm
View File

@ -75,6 +75,10 @@
(private-key build-machine-private-key ; file name (private-key build-machine-private-key ; file name
(default (user-openssh-private-key))) (default (user-openssh-private-key)))
(host-key build-machine-host-key) ; string (host-key build-machine-host-key) ; string
(compression build-machine-compression ; string
(default "zlib@openssh.com,zlib"))
(compression-level build-machine-compression-level ;integer
(default 3))
(daemon-socket build-machine-daemon-socket ; string (daemon-socket build-machine-daemon-socket ; string
(default "/var/guix/daemon-socket/socket")) (default "/var/guix/daemon-socket/socket"))
(parallel-builds build-machine-parallel-builds ; number (parallel-builds build-machine-parallel-builds ; number
@ -175,8 +179,10 @@ private key from '~a': ~a")
;; We need lightweight compression when ;; We need lightweight compression when
;; exchanging full archives. ;; exchanging full archives.
#:compression "zlib" #:compression
#:compression-level 3))) (build-machine-compression machine)
#:compression-level
(build-machine-compression-level machine))))
(match (connect! session) (match (connect! session)
('ok ('ok
;; Authenticate the server. XXX: Guile-SSH 0.10.1 doesn't know about ;; Authenticate the server. XXX: Guile-SSH 0.10.1 doesn't know about