From: Eric Wong <e@80x24.org>
Date: Thu, 12 Oct 2023 00:21:00 +0000 (+0000)
Subject: lei: quiet excessive write/seen messages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeb7b20926d7837a789c60ad58b9d1e119ae3612;p=thirdparty%2Fpublic-inbox.git

lei: quiet excessive write/seen messages

We don't want to end up dumping nr_seen/nr_write when progress
is disabled, nor do we want forked off `lei note-event' workers
dump them when DS->Reset is called on fork.
---

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index af39f8aff..b00be1a1d 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -631,6 +631,7 @@ sub pkt_op_pair {
 
 sub incr {
 	my $lei = shift;
+	$lei->{incr_pid} = $$ if @_;
 	while (my ($f, $n) = splice(@_, 0, 2)) { $lei->{$f} += $n }
 }
 
@@ -1399,10 +1400,12 @@ sub busy { 1 } # prevent daemon-shutdown if client is connected
 # can immediately reread it
 sub DESTROY {
 	my ($self) = @_;
-	for my $k (sort(grep(/\A-nr_/, keys %$self))) {
-		my $nr = $self->{$k};
-		substr($k, 0, length('-nr_'), '');
-		$self->child_error(0, "$nr $k messages");
+	if (defined($self->{incr_pid}) && $self->{incr_pid} == $$) {
+		for my $k (sort(grep(/\A-nr_/, keys %$self))) {
+			my $nr = $self->{$k};
+			substr($k, 0, length('-nr_'), '');
+			$self->child_error(0, "$nr $k messages");
+		}
 	}
 	$self->{1}->autoflush(1) if $self->{1};
 	stop_pager($self);
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 2a4af3e72..d83a403c9 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -419,12 +419,12 @@ Error closing $lei->{ovv}->{dst}: \$!=$! \$?=$?
 			delete $l2m->{mbl}; # drop dotlock
 		}
 	}
+	my $nr_w = delete($lei->{-nr_write}) // 0;
+	my $nr_dup = (delete($lei->{-nr_seen}) // 0) - $nr_w;
 	if ($lei->{-progress}) {
 		my $tot = $lei->{-mset_total} // 0;
-		my $nr_w = delete($lei->{-nr_write}) // 0;
-		my $d = (delete($lei->{-nr_seen}) // 0) - $nr_w;
 		my $x = "$tot matches";
-		$x .= ", $d duplicates" if $d;
+		$x .= ", $nr_dup duplicates" if $nr_dup;
 		if ($l2m) {
 			my $m = "# $nr_w written to " .
 				"$lei->{ovv}->{dst} ($x)";