wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

processGraph(): Don't throw ThreadPoolShutDown if there is an exception

Browse source 
Fixes

  $ nix copy --derivation --to /tmp/nix /nix/store/...
  error: cannot enqueue a work item while the thread pool is shutting down

The ThreadPoolShutDown exception was hiding the reason for the thread
pool shut down, e.g.

  error: cannot add path '/nix/store/03sl46khd8gmjpsad7223m32ma965vy9-fix-static.patch' because it lacks a signature by a trusted key

(cherry picked from commit a8c69cc907)
This commit is contained in:
Eelco Dolstra 2025-01-20 13:22:50 +01:00 • committed by Mergify
parent 2009cc137a
commit a1b4bc7292
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libutil/thread-pool.hh
View file

@ -150,8 +150,16 @@ void processGraph(
}
};
for (auto & node : nodes)
for (auto & node : nodes) {
try {
pool.enqueue(std::bind(worker, std::ref(node)));
} catch (ThreadPoolShutDown &) {
/* Stop if the thread pool is shutting down. It means a
previous work item threw an exception, so process()
below will rethrow it. */
break;
}
}
pool.process();