user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 79/95] lei_mirror: update fingerprints when writing local manifest.js.gz
Date: Mon, 28 Nov 2022 05:32:16 +0000	[thread overview]
Message-ID: <20221128053232.291618-80-e@80x24.org> (raw)
In-Reply-To: <20221128053232.291618-1-e@80x24.org>

We need our local manifest to match the actual data we store,
not what we're mirroring.
---
 lib/PublicInbox/LeiMirror.pm | 70 +++++++++++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 12 deletions(-)

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 2e94a2fa..b982f919 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -692,17 +692,46 @@ sub reap_cmd { # async, called via SIGCHLD
 	$self->{lei}->child_error($cerr, "@$cmd failed (\$?=$cerr)") if $cerr;
 }
 
+sub up_fp_done {
+	my ($self) = @_;
+	return if !keep_going($self);
+	my $fh = delete $self->{-show_ref_up} // die 'BUG: no show-ref output';
+	seek($fh, SEEK_SET, 0) or die "seek(show_ref): $!";
+	$self->{-ent} // die 'BUG: no -ent';
+	my $A = $self->{-ent}->{fingerprint} // die 'BUG: no fingerprint';
+	my $B = sha1_hex(do { local $/; <$fh> } // die("read(show_ref): $!"));
+	return if $A eq $B;
+	$self->{-ent}->{fingerprint} = $B;
+	push @{$self->{chg}->{fp_mismatch}}, $self->{-key};
+}
+
+sub update_ent {
+	my ($self) = @_;
+	my $key = $self->{-key} // die 'BUG: no -key';
+	my $new = $self->{-ent}->{fingerprint};
+	my $cur = $self->{-local_manifest}->{$key}->{fingerprint} // "\0";
+	my $dst = $self->{cur_dst} // $self->{dst};
+	if (defined($new) && $new ne $cur) {
+		my $cmd = ['git', "--git-dir=$dst", 'show-ref'];
+		my $opt = { 2 => $self->{lei}->{2} };
+		open($opt->{1}, '+>', undef) or die "open(tmp): $!";
+		$self->{-show_ref_up} = $opt->{1};
+		my $done = PublicInbox::OnDestroy->new($$, \&up_fp_done, $self);
+		start_cmd($self, $cmd, $opt, $done);
+	}
+	$new = $self->{-ent}->{owner} // return;
+	$cur = $self->{-local_manifest}->{$key}->{owner} // "\0";
+	return if $cur eq $new;
+	my $cmd = [ qw(git config -f), "$dst/config", 'gitweb.owner', $new ];
+	start_cmd($self, $cmd, { 2 => $self->{lei}->{2} });
+}
+
 sub v1_done { # called via OnDestroy
 	my ($self) = @_;
 	return if $self->{dry_run} || !keep_going($self);
 	_write_inbox_config($self);
 	my $dst = $self->{cur_dst} // $self->{dst};
-	if (defined(my $o = $self->{-ent} ? $self->{-ent}->{owner} : undef)) {
-		my $key = $self->{-key} // die 'BUG: no -key';
-		my $cur = $self->{-local_manifest}->{$key}->{owner} // "\0";
-		$cur eq $o or run_die([qw(git config -f),
-					"$dst/config", 'gitweb.owner', $o]);
-	}
+	update_ent($self) if $self->{-ent};
 	my $o = "$dst/objects";
 	if (open(my $fh, '<', my $fn = "$o/info/alternates")) {;
 		my $base = File::Spec->rel2abs($o);
@@ -797,7 +826,7 @@ failed to extract epoch number from $src
 		}
 	}
 	# filter out the epochs we skipped
-	$self->{-culled_manifest} = 1 if $m && delete(@$m{@skip});
+	$self->{chg}->{manifest} = 1 if $m && delete(@$m{@skip});
 
 	(!$self->{dry_run} && !-d $dst) and File::Path::mkpath($dst);
 
@@ -854,8 +883,8 @@ sub multi_inbox ($$$) {
 				$self->{lei}->glob2re($_) // qr/\A\Q$_\E/
 			} @$incl).'\\z)';
 		my @gone = delete @$v2{grep(!/$re/, keys %$v2)};
-		delete @$m{map { @$_ } @gone} and $self->{-culled_manifest} = 1;
-		delete @$m{grep(!/$re/, @v1)} and $self->{-culled_manifest} = 1;
+		delete @$m{map { @$_ } @gone} and $self->{chg}->{manifest} = 1;
+		delete @$m{grep(!/$re/, @v1)} and $self->{chg}->{manifest} = 1;
 		@v1 = grep(/$re/, @v1);
 	}
 	if (defined $excl) {
@@ -863,8 +892,8 @@ sub multi_inbox ($$$) {
 				$self->{lei}->glob2re($_) // qr/\A\Q$_\E/
 			} @$excl).'\\z)';
 		my @gone = delete @$v2{grep(/$re/, keys %$v2)};
-		delete @$m{map { @$_ } @gone} and $self->{-culled_manifest} = 1;
-		delete @$m{grep(/$re/, @v1)} and $self->{-culled_manifest} = 1;
+		delete @$m{map { @$_ } @gone} and $self->{chg}->{manifest} = 1;
+		delete @$m{grep(/$re/, @v1)} and $self->{chg}->{manifest} = 1;
 		@v1 = grep(!/$re/, @v1);
 	}
 	my $ret; # { v1 => [ ... ], v2 => { "/$inbox_name" => [ epochs ] }}
@@ -963,6 +992,7 @@ sub try_manifest {
 	}
 	my $ft = File::Temp->new(TEMPLATE => '.manifest-XXXX', %opt);
 	my $cmd = $curl->for_uri($lei, $uri, qw(-f -R -o), $ft->filename);
+	my $mf_url = "$uri";
 	%opt = map { $_ => $lei->{$_} } (0..2);
 	my $cerr = run_reap($lei, $cmd, \%opt);
 	if ($cerr) {
@@ -974,6 +1004,7 @@ sub try_manifest {
 		warn $@;
 		return try_scrape($self);
 	}
+	local $self->{chg} = {};
 	local $self->{-local_manifest} = load_current_manifest($self);
 	my ($path_pfx, $n, $multi) = multi_inbox($self, \$path, $m);
 	return $lei->child_error(1, $multi) if !ref($multi);
@@ -1034,7 +1065,22 @@ EOM
 	return if $self->{dry_run} || !keep_going($self);
 
 	# set by clone_v2_prep/-I/--exclude
-	dump_manifest($m => $ft) if delete $self->{-culled_manifest};
+	my $mis = delete $self->{chg}->{fp_mismatch};
+	if ($mis) {
+		my $t = (stat($ft))[9];
+		require POSIX;
+		$t = POSIX::strftime('%Y-%m-%d %k:%M:%S %z', localtime($t));
+		warn <<EOM;
+W: Fingerprints for the following repositories do not match
+W: $mf_url @ $t:
+W: These repositories may have updated since $t:
+EOM
+		warn "\t", $_, "\n" for @$mis;
+		warn <<EOM if !$self->{lei}->{opt}->{prune};
+W: The above fingerprints may never match without --prune
+EOM
+	}
+	dump_manifest($m => $ft) if delete($self->{chg}->{manifest}) || $mis;
 	ft_rename($ft, $manifest, 0666);
 	open my $x, '>', "$self->{dst}/mirror.done"; # for _wq_done_wait
 }

  parent reply	other threads:[~2022-11-28  5:32 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-28  5:30 [PATCH 00/95] clone: multi-inbox/repo support Eric Wong
2022-11-28  5:30 ` [PATCH 01/95] clone: support multi-inbox clone Eric Wong
2022-11-28  5:30 ` [PATCH 02/95] clone: support --include and --exclude with multi-clone Eric Wong
2022-11-28  5:31 ` [PATCH 03/95] clone: parallelize v2 epoch clones Eric Wong
2022-11-28  5:31 ` [PATCH 04/95] lei_mirror: async config retrieval for v2 w/ manifest Eric Wong
2022-11-28  5:31 ` [PATCH 05/95] lei_mirror: rely on DESTROY to index v2 inbox Eric Wong
2022-11-28  5:31 ` [PATCH 06/95] lei_mirror: rely on global process reaper Eric Wong
2022-11-28  5:31 ` [PATCH 07/95] clone: support parallel v1 clones Eric Wong
2022-11-28  5:31 ` [PATCH 08/95] lei_mirror: default to single job by default Eric Wong
2022-11-28  5:31 ` [PATCH 09/95] lei_mirror: move directory creation to v2-only path Eric Wong
2022-11-28  5:31 ` [PATCH 10/95] lei_mirror: retrieve description text asynchronously, too Eric Wong
2022-11-28  5:31 ` [PATCH 11/95] switch inotify/kevent stuff to v5.12 Eric Wong
2022-11-28  5:31 ` [PATCH 12/95] manifest: update module blurb + v5.12 Eric Wong
2022-11-28  5:31 ` [PATCH 13/95] lei_mirror: simplify _get_txt_start callers Eric Wong
2022-11-28  5:31 ` [PATCH 14/95] lei_mirror: elide description retrieval for v1|coderepo Eric Wong
2022-11-28  5:31 ` [PATCH 15/95] lei_mirror: add a hint for skipped epoch permissions Eric Wong
2022-11-28  5:31 ` [PATCH 16/95] lei_mirror: consolidate clone process management Eric Wong
2022-11-28  5:31 ` [PATCH 17/95] lei_mirror: load File::Path unconditionally Eric Wong
2022-11-28  5:31 ` [PATCH 18/95] lei_mirror: load most modules up-front Eric Wong
2022-11-28  5:31 ` [PATCH 19/95] lei_mirror: set gitweb.owner from manifest Eric Wong
2022-11-28  5:31 ` [PATCH 20/95] clone: support --dry-run / -n flag Eric Wong
2022-11-28  5:31 ` [PATCH 21/95] lei_mirror: initialize placeholders with "head" from manifest Eric Wong
2022-11-28  5:31 ` [PATCH 22/95] lei_mirror: support {reference} for v1 manifest clones Eric Wong
2022-11-28  5:31 ` [PATCH 23/95] lei_mirror: reduce noise on interrupted clones Eric Wong
2022-11-28  5:31 ` [PATCH 24/95] clone: support --inbox-config option Eric Wong
2022-11-28  5:31 ` [PATCH 25/95] lei_mirror: retrieve v2 description properly Eric Wong
2022-11-28  5:31 ` [PATCH 26/95] lei_mirror: reduce scope of v2 lock Eric Wong
2022-11-28  5:31 ` [PATCH 27/95] lei_mirror: allow --epoch on mixed v1/v2 clones Eric Wong
2022-11-28  5:31 ` [PATCH 28/95] lei_mirror: fix infinite loop in dependency resolution Eric Wong
2022-11-28  5:31 ` [PATCH 29/95] lei_mirror: defend against infinite loops Eric Wong
2022-11-28  5:31 ` [PATCH 30/95] lei_mirror: do not fetch descriptions if using manifest Eric Wong
2022-11-28  5:31 ` [PATCH 31/95] lei_mirror: require PublicInbox::Lock at use Eric Wong
2022-11-28  5:31 ` [PATCH 32/95] lei_mirror: fix glob semantics to match end-of-path Eric Wong
2022-11-28  5:31 ` [PATCH 33/95] lei_mirror: differentiate -entv vs -ent Eric Wong
2022-11-28  5:31 ` [PATCH 34/95] lei_mirror: support manifest {references} for v2 epochs Eric Wong
2022-11-28  5:31 ` [PATCH 35/95] lei_mirror: simplify v2 code paths Eric Wong
2022-11-28  5:31 ` [PATCH 36/95] clone: support --inbox-version Eric Wong
2022-11-28  5:31 ` [PATCH 37/95] lei_mirror: require Perl v5.12+ Eric Wong
2022-11-28  5:31 ` [PATCH 38/95] lei_mirror: ensure curl exits 22 on HTTP 404 responses Eric Wong
2022-11-28  5:31 ` [PATCH 39/95] lei_mirror: cleanup File::Temp OO usage Eric Wong
2022-11-28  5:31 ` [PATCH 40/95] lei_mirror: add `index' target to generated Makefile Eric Wong
2022-11-28  5:31 ` [PATCH 41/95] lei_mirror: do not write Makefile for --inbox-config=never Eric Wong
2022-11-28  5:31 ` [PATCH 42/95] lei_mirror: hoist out dump_manifest sub Eric Wong
2022-11-28  5:31 ` [PATCH 43/95] lei_mirror: avoid convoluted lazy_cb usage Eric Wong
2022-11-28  5:31 ` [PATCH 44/95] lei_mirror: simplify clone_v2_prep Eric Wong
2022-11-28  5:31 ` [PATCH 45/95] lei_mirror: support --objstore and forkgroups Eric Wong
2022-11-28  5:31 ` [PATCH 46/95] lei_mirror: cleanup process reaping logic Eric Wong
2022-11-28  5:31 ` [PATCH 47/95] lei_mirror: ensure git <1.8.5 fallback can use torsocks Eric Wong
2022-11-28  5:31 ` [PATCH 48/95] clone: flesh out --objstore behavior and document Eric Wong
2022-11-28  5:31 ` [PATCH 49/95] lei_mirror: always pack refs for coderepos Eric Wong
2022-11-28  5:31 ` [PATCH 50/95] lei_mirror: set description for non-inboxes, too Eric Wong
2022-11-28  5:31 ` [PATCH 51/95] lei_mirror: force --no-tags when fetching forkgroups Eric Wong
2022-11-28  5:31 ` [PATCH 52/95] lei_mirror: preserve permissions of existing alternates file Eric Wong
2022-11-28  5:31 ` [PATCH 53/95] lei_mirror: do not show ref updates w/o --verbose Eric Wong
2022-11-28  5:31 ` [PATCH 54/95] lei_mirror: drop git <1.8.5 support Eric Wong
2022-11-28  5:31 ` [PATCH 55/95] lei_mirror: make basename more descriptive Eric Wong
2022-11-28  5:31 ` [PATCH 56/95] lei_mirror: fix --dry-run for forkgroups Eric Wong
2022-11-28  5:31 ` [PATCH 57/95] lei_mirror: forkgroups use `git fetch --multiple' Eric Wong
2022-11-28  5:31 ` [PATCH 58/95] clone: move --dry-run handling to lei_mirror Eric Wong
2022-11-28  5:31 ` [PATCH 59/95] clone: drop unnecessary requires Eric Wong
2022-11-28  5:31 ` [PATCH 60/95] clone: use v5.12 Eric Wong
2022-11-28  5:31 ` [PATCH 61/95] clone: require `--objstore=' for default location Eric Wong
2022-11-28  5:31 ` [PATCH 62/95] lei_mirror: shorten remote names Eric Wong
2022-11-28  5:32 ` [PATCH 63/95] fetch: use v5.12 Eric Wong
2022-11-28  5:32 ` [PATCH 64/95] fetch: eliminate File::Temp->filename var Eric Wong
2022-11-28  5:32 ` [PATCH 65/95] lei_mirror: properly pack-refs in non-forkgroup repos Eric Wong
2022-11-28  5:32 ` [PATCH 66/95] lei_mirror: show child error error code Eric Wong
2022-11-28  5:32 ` [PATCH 67/95] on_destroy: support ->cancel callback Eric Wong
2022-11-28  5:32 ` [PATCH 68/95] lei_mirror: support resuming multi-repo clones Eric Wong
2022-11-28  5:32 ` [PATCH 69/95] lei_mirror: check fingerprints before fetching Eric Wong
2022-11-28  5:32 ` [PATCH 70/95] clone: support loading manifest.js.gz from destination Eric Wong
2022-11-28  5:32 ` [PATCH 71/95] lei_mirror: delay configuring forkgroups Eric Wong
2022-11-28  5:32 ` [PATCH 72/95] clone: canonicalize destination path from CLI Eric Wong
2022-11-28  5:32 ` [PATCH 73/95] clone|fetch: support passing --prune(-tags) to `git fetch' Eric Wong
2022-11-28  5:32 ` [PATCH 74/95] lei_mirror: avoid needless FD passing Eric Wong
2022-11-28  5:32 ` [PATCH 75/95] clone: support --keep-going/-k like make(1) Eric Wong
2022-11-28  5:32 ` [PATCH 76/95] lei_mirror: don't warn on missing manifest on initial clone Eric Wong
2022-11-28  5:32 ` [PATCH 77/95] lei_mirror: respect `./' and `../' prefixes for CLI args Eric Wong
2022-11-28  5:32 ` [PATCH 78/95] lei_mirror: --manifest= affects destination, too Eric Wong
2022-11-28  5:32 ` Eric Wong [this message]
2022-11-28  5:32 ` [PATCH 80/95] lei_mirror: remove janky mirror.done stamp file Eric Wong
2022-11-28  5:32 ` [PATCH 81/95] lei_mirror: simplify most process spawning Eric Wong
2022-11-28  5:32 ` [PATCH 82/95] lei_mirror: run v1_done earlier on forkgroup done Eric Wong
2022-11-28  5:32 ` [PATCH 83/95] lei_mirror: simplify forkgroup-related subs Eric Wong
2022-11-28  5:32 ` [PATCH 84/95] lei_mirror: shorten scope mirror objects Eric Wong
2022-11-28  5:32 ` [PATCH 85/95] lei_mirror: set {head} from manifest Eric Wong
2022-11-28  5:32 ` [PATCH 86/95] lei_mirror: support {symlinks} " Eric Wong
2022-11-28  5:32 ` [PATCH 87/95] lei_mirror: eliminate circular references Eric Wong
2022-11-28  5:32 ` [PATCH 88/95] lei_mirror: use curl -z/--timecond if manifest exists Eric Wong
2022-11-28  5:32 ` [PATCH 89/95] lei_mirror: avoid redundant curl `-f' use Eric Wong
2022-11-28  5:32 ` [PATCH 90/95] lei_mirror: omit trailing slash for git remote.*.url Eric Wong
2022-11-28  5:32 ` [PATCH 91/95] lei_mirror: set info/web/last-modified from manifest Eric Wong
2022-11-28  5:32 ` [PATCH 92/95] lei_mirror: don't clobber inbox.config.example if it exists Eric Wong
2022-11-28  5:32 ` [PATCH 93/95] lei_mirror: break out of fgrp fetch iteration early Eric Wong
2022-11-28  5:32 ` [PATCH 94/95] clone: support --project-list= for cgit Eric Wong
2022-11-28  5:32 ` [PATCH 95/95] lei_mirror: handle forkgroup changes Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221128053232.291618-80-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).