[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: offload: Remove redundant call to 'topologically-sorted' in 'send
From: |
Ludovic Courtès |
Subject: |
01/06: offload: Remove redundant call to 'topologically-sorted' in 'send-file'. |
Date: |
Thu, 1 Dec 2016 22:35:31 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit f3cf860635841f2a17640d9a65e5f389d56470cd
Author: Ludovic Courtès <address@hidden>
Date: Thu Dec 1 21:48:20 2016 +0100
offload: Remove redundant call to 'topologically-sorted' in 'send-file'.
* guix/scripts/offload.scm (send-files): Remove call to
'topologically-sorted'.
---
guix/scripts/offload.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index bc024a8..1d60f65 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -429,10 +429,8 @@ be read."
(define (send-files files remote)
"Send the subset of FILES that's missing to REMOTE, a remote store."
(with-store store
- ;; Compute the subset of FILES missing on SESSION, and send them in
- ;; topologically sorted order so that they can actually be imported.
- (let* ((sorted (topologically-sorted store files))
- (session (channel-get-session (nix-server-socket remote)))
+ ;; Compute the subset of FILES missing on SESSION and send them.
+ (let* ((session (channel-get-session (nix-server-socket remote)))
(node (make-node session))
(missing (node-eval node
`(begin
@@ -441,11 +439,12 @@ be read."
(with-store store
(remove (cut valid-path? store <>)
- ',sorted)))))
+ ',files)))))
(port (store-import-channel session)))
(format #t (_ "sending ~a store files to '~a'...~%")
(length missing) (session-get session 'host))
+ ;; Send MISSING in topological order.
(export-paths store missing port)
;; Tell the remote process that we're done. (In theory the
- branch master updated (4b67098 -> 463fb7d), Ludovic Courtès, 2016/12/01
- 01/06: offload: Remove redundant call to 'topologically-sorted' in 'send-file'.,
Ludovic Courtès <=
- 03/06: daemon: Buffer data sent to clients by the 'export-path' RPC., Ludovic Courtès, 2016/12/01
- 05/06: offload: Gracefully report connection failures., Ludovic Courtès, 2016/12/01
- 02/06: offload: Warn about the lack of zlib support., Ludovic Courtès, 2016/12/01
- 04/06: store: Increase buffering for the '%stderr-write' upcall., Ludovic Courtès, 2016/12/01
- 06/06: offload: Do not abort when a machine is unreachable., Ludovic Courtès, 2016/12/01