From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 33D8E1F454 for ; Fri, 7 Apr 2023 12:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1680871254; bh=yLA5G2a49qz7qfKSjJbH8MahtDn2ybeI3o9e7e6G7E0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ysjDa9+XkS4A3o7hdisU3uge1YKSHJdb3H3JXod1Y+4Z7guHJ6dVE2EP4DXHZpkSv b3XmKgOWwCHRiJZycrANCL5HP2aAV5RKttQCdeVV785ntBjLCqCrSuY7cx0yPQo/VS 02WEmBL7AiuGamnyNoXwmRw9Aleo1YTO6+hHF8Mo= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/6] cindex: improve progress display Date: Fri, 7 Apr 2023 12:40:48 +0000 Message-Id: <20230407124053.2233988-2-e@80x24.org> In-Reply-To: <20230407124053.2233988-1-e@80x24.org> References: <20230407124053.2233988-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Instead of displaying the total number of changes across all repos next to the repo path ("$GIT_DIR: $TOTAL commits"), we'll only show the number of changes made in that repo. We'll also note when a prune is complete on a shard, since prunes may often be expensive no-ops. --- lib/PublicInbox/CodeSearchIdx.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index f3d07f25..5f20325a 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -437,6 +437,7 @@ sub partition_refs ($$$) { $fh; } @RDONLY_XDB; + my $n0 = $NCHANGE; while (defined(my $cmt = <$rfh>)) { chomp $cmt; my $n = hex(substr($cmt, 0, 8)) % scalar(@RDONLY_XDB); @@ -458,7 +459,8 @@ sub partition_refs ($$$) { close($rfh); return () if $DO_QUIT; if (!$? || (($? & 127) == POSIX::SIGPIPE && $seen > $SEEN_MAX)) { - progress($self, "$git->{git_dir}: $NCHANGE commits"); + my $n = $NCHANGE - $n0; + progress($self, "$git->{git_dir}: $n commits") if $n; for my $fh (@shard_in) { $fh->flush or die "flush: $!"; sysseek($fh, 0, SEEK_SET) or die "seek: $!"; @@ -697,6 +699,8 @@ sub event_step { # may be requeued via DS cidx_ckpoint($self); return PublicInbox::DS::requeue($self) if $PRUNE_CUR <= $PRUNE_MAX; send($PRUNE_OP_P, "prune_done $self->{shard}", MSG_EOR); + $PRUNE_NR //= 0; + progress($self, "prune [$self->{shard}] $PRUNE_NR done"); $TMP_GIT->cleanup; $TMP_GIT = $PRUNE_OP_P = $PRUNE_CUR = $PRUNE_MAX = undef; %ACTIVE_GIT_DIR = ();