Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 2.19-maintenance] withFramedSink(): Receive interrupts on the stderr thread #9691

Merged
merged 2 commits into from
Jan 8, 2024
Merged

[Backport 2.19-maintenance] withFramedSink(): Receive interrupts on the stderr thread #9691

merged 2 commits into from
Jan 8, 2024

Commits on Jan 4, 2024

  1. withFramedSink(): Receive interrupts on the stderr thread 

    Otherwise Nix deadlocks when Ctrl-C is received in withFramedSink():
the parent thread will wait forever for the stderr thread to shut
down.

Fixes the hang reported in #7245 (comment).

(cherry picked from commit 24e7048)
    @edolstra @github-actions
    edolstra authored and github-actions[bot] committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    4b38ebb View commit details
    Browse the repository at this point in the history

  2. Make some more threads receive interrupts 

    Shouldn't hurt to do this. In particular, this should speed up
shutting down the PathSubstitutionGoal thread if it's copying from a
remote store.

(cherry picked from commit 295a2ff)
    @edolstra @github-actions
    edolstra authored and github-actions[bot] committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    6af94c4 View commit details
    Browse the repository at this point in the history