testcommon: DESTROY: wait for killed daemon

[public-inbox.git] / lib / PublicInbox / Xapcmd.pm

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 7414c9b6802db909fa03046b52a92a263f017e0d..337978bd1a8799b79d10a315341333b06cf6ae3c 100644 (file)
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -142,7 +142,11 @@ sub process_queue {
                while (scalar keys %pids) {
                        my $pid = waitpid(-1, 0);
                        my $args = delete $pids{$pid};
-                       die join(' ', @$args)." failed: $?\n" if $?;
+                       if ($args) {
+                               die join(' ', @$args)." failed: $?\n" if $?;
+                       } else {
+                               warn "unknown PID($pid) reaped: $?\n";
+                       }
                }
        }
 }
@@ -217,13 +221,15 @@ sub prepare_run {
        ($tmp, \@queue);
 }
 
+sub check_compact () { runnable_or_die($XAPIAN_COMPACT) }
+
 sub run {
        my ($ibx, $task, $opt) = @_; # task = 'cpdb' or 'compact'
        my $cb = \&${\"PublicInbox::Xapcmd::$task"};
        PublicInbox::Admin::progress_prepare($opt ||= {});
        defined(my $dir = $ibx->{inboxdir}) or die "no inboxdir defined\n";
        -d $dir or die "inboxdir=$dir does not exist\n";
-       runnable_or_die($XAPIAN_COMPACT) if $opt->{compact};
+       check_compact() if $opt->{compact};
        my $reindex; # v1:{ from => $x40 }, v2:{ from => [ $x40, $x40, .. ] } }
 
        if (!$opt->{-coarse_lock}) {