lei q: show progress on >1s preparation phase

[public-inbox.git] / t / run.perl

diff --git a/t/run.perl b/t/run.perl
index e8512e183acc84cceab436b223ca947f209e1ee2..e5ee0ade3de72ca57467e27f72f128b27484de0e 100755 (executable)
--- a/t/run.perl
+++ b/t/run.perl
@@ -14,10 +14,12 @@ use strict;
 use v5.10.1;
 use IO::Handle; # ->autoflush
 use PublicInbox::TestCommon;
+use PublicInbox::Spawn;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
 use Errno qw(EINTR);
 use Fcntl qw(:seek);
-use POSIX qw(_POSIX_PIPE_BUF WNOHANG);
+use POSIX qw(WNOHANG);
+use File::Temp ();
 my $jobs = 1;
 my $repeat = 1;
 $| = 1;
@@ -38,8 +40,43 @@ open my $OLDERR, '>&STDERR' or die "dup STDERR: $!";
 $OLDOUT->autoflush(1);
 $OLDERR->autoflush(1);
 
+my ($run_log, $tmp_rl);
+my $rl = $ENV{TEST_RUN_LOG};
+unless ($rl) {
+       $tmp_rl = File::Temp->new(CLEANUP => 1);
+       $rl = $tmp_rl->filename;
+}
+open $run_log, '+>>', $rl or die "open $rl: $!";
+$run_log->autoflush(1); # one reader, many writers
+
 key2sub($_) for @tests; # precache
 
+my ($for_destroy, $lei_env, $lei_daemon_pid, $owner_pid);
+
+# TEST_LEI_DAEMON_PERSIST is currently broken.  I get ECONNRESET from
+# lei even with high kern.ipc.soacceptqueue=1073741823 or SOMAXCONN, not
+# sure why.  Also, testing our internal inotify usage is unreliable
+# because lei-daemon uses a single inotify FD for all clients.
+if ($ENV{TEST_LEI_DAEMON_PERSIST} && !$ENV{TEST_LEI_DAEMON_PERSIST_DIR} &&
+               (PublicInbox::Spawn->can('recv_cmd4') ||
+                       eval { require Socket::MsgHdr })) {
+       $lei_env = {};
+       ($lei_env->{XDG_RUNTIME_DIR}, $for_destroy) = tmpdir;
+       $ENV{TEST_LEI_DAEMON_PERSIST_DIR} = $lei_env->{XDG_RUNTIME_DIR};
+       run_script([qw(lei daemon-pid)], $lei_env, { 1 => \$lei_daemon_pid });
+       chomp $lei_daemon_pid;
+       $lei_daemon_pid =~ /\A[0-9]+\z/ or die "no daemon pid: $lei_daemon_pid";
+       kill(0, $lei_daemon_pid) or die "kill $lei_daemon_pid: $!";
+       if (my $t = $ENV{GNU_TAIL}) {
+               system("$t --pid=$lei_daemon_pid -F " .
+                       "$lei_env->{XDG_RUNTIME_DIR}/lei/errors.log >&2 &");
+       }
+       if (my $strace_cmd = $ENV{STRACE_CMD}) {
+               system("$strace_cmd -p $lei_daemon_pid &");
+       }
+       $owner_pid = $$;
+}
+
 if ($shuffle) {
        require List::Util;
 } elsif (open(my $prove_state, '<', '.prove') && eval { require YAML::XS }) {
@@ -98,6 +135,7 @@ END { test_status() if (defined($worker_test) && $worker == $$) }
 
 sub run_test ($) {
        my ($test) = @_;
+       syswrite($run_log, "$$ $test\n");
        my $log_fh;
        if ($log_suffix ne '') {
                my $log = $test;
@@ -161,7 +199,7 @@ for (my $i = $repeat; $i != 0; $i--) {
        pipe(my ($rd, $wr)) or DIE "pipe: $!";
 
        # fill the queue before forking so children can start earlier
-       my $n = (_POSIX_PIPE_BUF / UINT_SIZE);
+       my $n = (POSIX::PIPE_BUF / UINT_SIZE);
        if ($n >= $#todo) {
                print $wr join('', map { pack('I', $_) } (0..$#todo)) or DIE;
                undef $wr;
@@ -183,7 +221,12 @@ for (my $i = $repeat; $i != 0; $i--) {
                                push @err, "reaped unknown $pid ($?)";
                                next;
                        }
-                       push @err, "job[$j] ($?)" if $?;
+                       if ($?) {
+                               seek($run_log, 0, SEEK_SET);
+                               chomp(my @t = grep(/^$pid /, <$run_log>));
+                               $t[0] //= "$pid unknown";
+                               push @err, "job[$j] ($?) PID=$t[-1]";
+                       }
                        # skip_all can exit(0), respawn if needed:
                        if (!$eof) {
                                print $OLDERR "# respawning job[$j]\n";
@@ -209,3 +252,10 @@ for (my $i = $repeat; $i != 0; $i--) {
 }
 
 print $OLDOUT "1..".($repeat * scalar(@tests))."\n" if $repeat >= 0;
+if ($lei_env && $$ == $owner_pid) {
+       my $opt = { 1 => $OLDOUT, 2 => $OLDERR };
+       my $cur_daemon_pid;
+       run_script([qw(lei daemon-pid)], $lei_env, { 1 => \$cur_daemon_pid });
+       run_script([qw(lei daemon-kill)], $lei_env, $opt);
+       DIE "lei daemon restarted\n" if $cur_daemon_pid != $lei_daemon_pid;
+}