From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
	autolearn=ham autolearn_force=no version=3.4.6
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 365501F406
	for <meta@public-inbox.org>; Thu, 12 Oct 2023 00:21:00 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org;
	s=selector1; t=1697070060;
	bh=KmCpEBU/DxZhURoWOtZGBtfO4ByVrD67PMDTXX1k0D4=;
	h=From:To:Subject:Date:From;
	b=tlgU9WlbksALzTYcp89A0/yULnjgSpSsg3HhLjqOG7cLca8jcUJ/vef9tiNnKhw+E
	 gY+YWAL4M7oKX+r+hiLDG6HYIYWH2zBiY0l0ral8snu6uLWTRd64s8IpBEQNA+WuRR
	 tMiQFNLEoS9lW0nDIR1sc8vIuY3yQAjqxnZn7FC4=
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei: quiet excessive write/seen messages
Date: Thu, 12 Oct 2023 00:21:00 +0000
Message-ID: <20231012002100.220022-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

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.
---
 lib/PublicInbox/LEI.pm        | 11 +++++++----
 lib/PublicInbox/LeiXSearch.pm |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index af39f8af..b00be1a1 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 2a4af3e7..d83a403c 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)";