03/05: daemon: Strictly respect timeouts for 'guix offload'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit ada9a19a2dca74feafcf24df1152abd685d4142f
Author: Ludovic Courtès <address@hidden>
Date:   Sat Sep 28 18:06:15 2019 +0200

    daemon: Strictly respect timeouts for 'guix offload'.
    
    Until now it was up to 'guix offload' to honor timeouts.  Unfortunately
    it would sometimes fail to do that, for example due to the libssh bug at
    <https://bugs.libssh.org/T33>.  With this change, 'guix offload' is
    automatically killed by the daemon when one of the timeouts expires.
    
    Thus, data transfers performed by 'guix offload' now count as part of
    the timeouts, rather than just actual build time.
    
    * nix/libstore/build.cc (DerivationGoal::tryBuildHook): Pass true as the
    'respectTimeouts' argument to 'childStarted'.
---
 nix/libstore/build.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index ad53b81..74cd054 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -1648,7 +1648,7 @@ HookReply DerivationGoal::tryBuildHook()
     set<int> fds;
     fds.insert(hook->fromHook.readSide);
     fds.insert(hook->builderOut.readSide);
-    worker.childStarted(shared_from_this(), hook->pid, fds, false, false);
+    worker.childStarted(shared_from_this(), hook->pid, fds, false, true);
 
     if (settings.printBuildTrace)
         printMsg(lvlError, format("@ build-started %1% - %2% %3% %4%")