Typo

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
ThreadPool: don't silently ignore non-std exceptions
2024-10-18 00:16:11 -04:00 · 2024-10-16 19:40:45 +02:00 · 2024-10-16 17:56:08 +02:00 · 2024-10-16 17:56:08 +02:00 · 2024-10-16 17:56:08 +02:00 · 2024-10-16 17:56:08 +02:00
3 changed files with 18 additions and 3 deletions
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@ -65,6 +65,7 @@
 #include <iostream>

 #include "strings.hh"
+#include "signals.hh"

 namespace nix {

@ -1579,6 +1580,8 @@ void LocalDerivationGoal::startDaemon()
                        FdSink(remote.get()),
                        NotTrusted, daemon::Recursive);
                    debug("terminated daemon connection");
+                } catch (const Interrupted &) {
+                    debug("interrupted daemon connection");
                } catch (SystemError &) {
                    ignoreExceptionExceptInterrupt();
                }
--- a/src/libstore/unix/build/local-derivation-goal.hh
+++ b/src/libstore/unix/build/local-derivation-goal.hh
@ -225,8 +225,15 @@ struct LocalDerivationGoal : public DerivationGoal
     */
    void writeStructuredAttrs();

+    /**
+     * Start an in-process nix daemon thread for recursive-nix.
+     */
    void startDaemon();

+    /**
+     * Stop the in-process nix daemon thread.
+     * @see startDaemon
+     */
    void stopDaemon();

    /**
--- a/src/libutil/thread-pool.cc
+++ b/src/libutil/thread-pool.cc
@ -110,10 +110,15 @@ void ThreadPool::doWork(bool mainThread)
                           propagate it. */
                        try {
                            std::rethrow_exception(exc);
+                        } catch (const Interrupted &) {
+                            // The interrupted state may be picked up by multiple
+                            // workers, which is expected, so we should ignore
+                            // it silently and let the first one bubble up,
+                            // rethrown via the original state->exception.
+                        } catch (const ThreadPoolShutDown &) {
+                            // Similarly expected.
                        } catch (std::exception & e) {
-                            if (!dynamic_cast<ThreadPoolShutDown*>(&e))
-                                ignoreExceptionExceptInterrupt();
-                        } catch (...) {
+                            ignoreExceptionExceptInterrupt();
                        }
                    }
                }
Author	SHA1	Message	Date
Robert Hensing	ed184f0b61	Typo Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>	2024-10-16 19:40:45 +02:00
Robert Hensing	fd8a4a86d9	ThreadPool: don't silently ignore non-std exceptions Introduced in `8f6b347abd` without explanation. Throwing anything that's not that is a programming mistake that we don't want to ignore silently. A crash would be ok, because that means we/they can fix the offending throw.	2024-10-16 17:56:08 +02:00
Robert Hensing	16320f6d24	Handle ThreadPoolShutdown with normal catch	2024-10-16 17:56:08 +02:00
Robert Hensing	3f9ff10786	ThreadPool: catch Interrupted	2024-10-16 17:56:08 +02:00
Robert Hensing	de41e46175	Document recursive-nix startDaemon/stopDaemon	2024-10-16 17:56:08 +02:00
Robert Hensing	0e5a5303ad	fix: Ignore Interrupted in recursive-nix daemon worker Otherwise, if checkInterrupt() in any of the supported store operations would catch onto a user interrupt, the exception would bubble to the thread start and be handled by std::terminate(): a crash.	2024-10-16 17:56:08 +02:00