From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 3/3] lei: give workers their own process group Date: Thu, 14 Oct 2021 04:32:55 +0000 [thread overview] Message-ID: <20211014043255.19545-4-e@80x24.org> (raw) In-Reply-To: <20211014043255.19545-1-e@80x24.org> This lets users Ctrl-Z from their terminal to pause an entire git-clone process hierarchy. --- lib/PublicInbox/LEI.pm | 10 ++++++---- lib/PublicInbox/LeiMirror.pm | 3 +-- lib/PublicInbox/LeiXSearch.pm | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 635cd0c5508a..145af7e2cb59 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -459,9 +459,9 @@ my @WQ_KEYS = qw(lxs l2m ikw pmd wq1 lne); # internal workers sub _drop_wq { my ($self) = @_; for my $wq (grep(defined, delete(@$self{@WQ_KEYS}))) { - if ($wq->wq_kill) { + if ($wq->wq_kill('-TERM')) { $wq->wq_close(0, undef, $self); - } elsif ($wq->wq_kill_old) { + } elsif ($wq->wq_kill_old('-TERM')) { $wq->wq_wait_old(undef, $self); } $wq->DESTROY; @@ -575,6 +575,7 @@ sub _lei_atfork_child { } else { # worker, Net::NNTP (Net::Cmd) uses STDERR directly open STDERR, '+>&='.fileno($self->{2}) or warn "open $!"; STDERR->autoflush(1); + POSIX::setpgid(0, $$) // die "setpgid(0, $$): $!"; } close($_) for (grep(defined, delete @$self{qw(3 old_1 au_done)})); if (my $op_c = delete $self->{pkt_op_c}) { @@ -1147,9 +1148,10 @@ sub event_step { if ($buf eq '') { _drop_wq($self); # EOF, client disconnected dclose($self); - } elsif ($buf =~ /\A(STOP|CONT)\z/) { + } elsif ($buf =~ /\A(?:STOP|CONT)\z/) { + my $sig = "-$buf"; for my $wq (grep(defined, @$self{@WQ_KEYS})) { - $wq->wq_kill($buf) or $wq->wq_kill_old($buf); + $wq->wq_kill($sig) or $wq->wq_kill_old($sig); } } else { die "unrecognized client signal: $buf"; diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index fb73d8631670..f1bc82e27205 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -9,7 +9,7 @@ use parent qw(PublicInbox::IPC); use PublicInbox::Config; use IO::Uncompress::Gunzip qw(gunzip $GunzipError); use IO::Compress::Gzip qw(gzip $GzipError); -use PublicInbox::Spawn qw(popen_rd spawn run_die); +use PublicInbox::Spawn qw(popen_rd spawn); use File::Temp (); use Fcntl qw(SEEK_SET O_CREAT O_EXCL O_WRONLY); use Carp qw(croak); @@ -192,7 +192,6 @@ sub index_cloned_inbox { sub run_reap { my ($lei, $cmd, $opt) = @_; $lei->qerr("# @$cmd"); - $opt->{pgid} = 0 if $lei->{sock}; my $pid = spawn($cmd, undef, $opt); my $reap = PublicInbox::OnDestroy->new($lei->can('sigint_reap'), $pid); waitpid($pid, 0) == $pid or die "waitpid @$cmd: $!"; diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index ee9216feeb23..668d0b6e5df3 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -469,7 +469,7 @@ sub do_post_augment { $err = $@; if ($err) { if (my $lxs = delete $lei->{lxs}) { - $lxs->wq_kill; + $lxs->wq_kill('-TERM'); $lxs->wq_close(0, undef, $lei); } $lei->fail("$err");
next prev parent reply other threads:[~2021-10-14 4:32 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-14 4:32 [PATCH 0/3] clone+fetch stuff Eric Wong 2021-10-14 4:32 ` [PATCH 1/3] clone+fetch: respect umask for all downloaded files Eric Wong 2021-10-14 4:32 ` [PATCH 2/3] lei add-external --mirror: respect client umask Eric Wong 2021-10-14 4:32 ` Eric Wong [this message] 2021-10-14 13:16 ` [PATCH 0/7] lei: more process handling fixes Eric Wong 2021-10-14 13:16 ` [PATCH 1/7] lei: use send() perlop for signals Eric Wong 2021-10-14 13:16 ` [PATCH 2/7] git: async_err shows retried requests properly Eric Wong 2021-10-14 13:16 ` [PATCH 3/7] git: ->fail invokes current callback Eric Wong 2021-10-14 13:16 ` [PATCH 4/7] git: cat-file --batch are their own pgrp Eric Wong 2021-10-14 13:16 ` [PATCH 5/7] lei: TSTP affects all curl and related subprocesses Eric Wong 2021-10-14 13:16 ` [PATCH 6/7] lei up: actually rely on DESTROY for --alllll Eric Wong 2021-10-14 13:16 ` [PATCH 7/7] lei up --all: send signals to workers, receive errors Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211014043255.19545-4-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 3/3] lei: give workers their own process group' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).