* [PATCH 36/95] clone: support --inbox-version
2022-11-28 5:30 7% [PATCH 00/95] clone: multi-inbox/repo support Eric Wong
@ 2022-11-28 5:31 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-11-28 5:31 UTC (permalink / raw)
To: meta
This is part of `lei add-external --mirror', and it makes
sense to have for development and testing. We'll also add
a fallback in case somebody tries --inbox-version and fails
due to a newer remote instances of public-inbox.
---
Documentation/lei-add-external.pod | 4 +++-
Documentation/public-inbox-clone.pod | 6 ++++++
lib/PublicInbox/LeiMirror.pm | 31 +++++++++++++++++-----------
script/public-inbox-clone | 2 +-
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/Documentation/lei-add-external.pod b/Documentation/lei-add-external.pod
index 7afcad63..2a131b55 100644
--- a/Documentation/lei-add-external.pod
+++ b/Documentation/lei-add-external.pod
@@ -75,7 +75,9 @@ Default: C<auto>
=item --inbox-version=NUM
-Force a public-inbox version (must be C<1> or C<2>).
+Force a remote public-inbox version (must be C<1> or C<2>).
+This is auto-detected by default, and this option exists mainly
+for testing.
=back
diff --git a/Documentation/public-inbox-clone.pod b/Documentation/public-inbox-clone.pod
index 52c89cfd..1c31fbb3 100644
--- a/Documentation/public-inbox-clone.pod
+++ b/Documentation/public-inbox-clone.pod
@@ -76,6 +76,12 @@ no v1 inboxes are present.
Default: C<always>
+=item --inbox-version=NUM
+
+Force a remote public-inbox version (must be C<1> or C<2>).
+This is auto-detected by default, and this option exists mainly
+for testing.
+
=item -n
=item --dry-run
diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 18c825d3..c3512d43 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -43,7 +43,7 @@ sub _wq_done_wait { # dwaitpid callback (via wq_eof)
# for old installations without manifest.js.gz
sub try_scrape {
- my ($self) = @_;
+ my ($self, $fallback_manifest) = @_;
my $uri = URI->new($self->{src});
my $lei = $self->{lei};
my $curl = $self->{curl} //= PublicInbox::LeiCurl->new($lei) or return;
@@ -54,9 +54,17 @@ sub try_scrape {
close($fh) or return $lei->child_error($?, "@$cmd failed");
# we grep with URL below, we don't want Subject/From headers
- # making us clone random URLs
+ # making us clone random URLs. This assumes remote instances
+ # prior to public-inbox 1.7.0
+ # 5b96edcb1e0d8252 (www: move mirror instructions to /text/, 2021-08-28)
my @html = split(/<hr>/, $html);
my @urls = ($html[-1] =~ m!\bgit clone --mirror ([a-z\+]+://\S+)!g);
+ if (!@urls && $fallback_manifest) {
+ warn <<EOM;
+W: failed to extract URLs from $uri, trying manifest.js.gz...
+EOM
+ return start_clone_url($self);
+ }
my $url = $uri->as_string;
chop($url) eq '/' or die "BUG: $uri not canonicalized";
@@ -603,7 +611,6 @@ sub try_manifest {
my $cmd = $curl->for_uri($lei, $uri, '-R', '-o', $fn);
my %opt = map { $_ => $lei->{$_} } (0..2);
my $cerr = run_reap($lei, $cmd, \%opt);
- local $LIVE;
if ($cerr) {
return try_scrape($self) if ($cerr >> 8) == 22; # 404 missing
return $lei->child_error($cerr, "@$cmd failed");
@@ -698,15 +705,15 @@ sub do_mirror { # via wq_io_do or public-inbox-clone
$ic =~ /\A(?:v1|v2|always|never)\z/s or die <<"";
--inbox-config must be one of `always', `v2', `v1', or `never'
- my $iv = $lei->{opt}->{'inbox-version'};
- if (defined $iv) {
- local $LIVE;
- return clone_v1($self) if $iv == 1;
- return try_scrape($self) if $iv == 2;
- die "bad --inbox-version=$iv\n";
- }
- return start_clone_url($self) if $self->{src} =~ m!://!;
- die "TODO: cloning local directories not supported, yet";
+ local $LIVE;
+ my $iv = $lei->{opt}->{'inbox-version'} //
+ return start_clone_url($self);
+ return clone_v1($self) if $iv == 1;
+ die "bad --inbox-version=$iv\n" if $iv != 2;
+ die <<EOM if $self->{src} !~ m!://!;
+cloning local v2 inboxes not supported
+EOM
+ try_scrape($self, 1);
};
$lei->fail($@) if $@;
}
diff --git a/script/public-inbox-clone b/script/public-inbox-clone
index 3d980c97..2900f232 100755
--- a/script/public-inbox-clone
+++ b/script/public-inbox-clone
@@ -23,7 +23,7 @@ options:
-C DIR chdir to specified directory
EOF
GetOptions($opt, qw(help|h quiet|q verbose|v+ C=s@ c=s@ include|I=s@ exclude=s@
- inbox-config=s
+ inbox-config=s inbox-version=i
dry-run|n jobs|j=i no-torsocks torsocks=s epoch=s)) or die $help;
if ($opt->{help}) { print $help; exit };
require PublicInbox::Admin; # loads Config
^ permalink raw reply related [relevance 6%]
* [PATCH 00/95] clone: multi-inbox/repo support...
@ 2022-11-28 5:30 7% Eric Wong
2022-11-28 5:31 6% ` [PATCH 36/95] clone: support --inbox-version Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2022-11-28 5:30 UTC (permalink / raw)
To: meta
A large patchset, and not done, yet :P It's only tested live,
but it seems to work reasonably well against live hosts...
Behavior changes to public-inbox-clone are NOT final; but
public-inbox-fetch|PublicInbox::Fetch will probably become
thin wrappers around LeiMirror.
--include=/--exclude= support now exists with glob support
--keep-going and --dry-run support added, too, since it's
make(1) influenced (more below)
It supports coderepos, too, using --inbox-config=never (default: always);
--project-list=, --manifest=, --objstore=, and --prune.
key differences from grok-pull (grokmirror) for coderepos:
* uses relative paths on the FS (dumb HTTP untested, but dumb
HTTP is a goal for memory-constrained hosts). This means
I can relocate coderepos freely within my FS or do sneakernet
transfers across machines without having to `perl -ipe s/x/y/'
on hundreds of info/alternates and config files.
* CLI-only, no extra config files (may generate a Makefile, like
individual inbox clones)
* objstore repos fetches from remotes directly
(does not need, use, nor benefit from hardlinks at all)
* no sleep states
It is not a full replacement for grokmirror
* reliant on default `git gc' behavior for repack. This is OK
since it's only one-way relationships between objstore and
non-objstore repos.
* no fsck support (probably will be in generated Makefile)
* doesn't generate forkgroups nor manifest.js.gz
(I may do this for coderepo Xapian indexing)
It relies on parallel git-fetch for objstores, so `-j $NUM'
calculations may end up being ($NUM * $NUM) in the worst case.
Not sure how to best approach this...
Maybe `-j $M,$N' similar to `lei q -j$M,$N` is a solution...
Design note:
This is an exercise in building make(1)-like parallelism using
->DESTROY callbacks for prerequisites; so it's a newish paradigm
for me. It forced me to fix a reference cycle, already.
TODO: repo|symlink pruning, --exit-code, retry/refetch, manpage updates
Eric Wong (95):
clone: support multi-inbox clone
clone: support --include and --exclude with multi-clone
clone: parallelize v2 epoch clones
lei_mirror: async config retrieval for v2 w/ manifest
lei_mirror: rely on DESTROY to index v2 inbox
lei_mirror: rely on global process reaper
clone: support parallel v1 clones
lei_mirror: default to single job by default
lei_mirror: move directory creation to v2-only path
lei_mirror: retrieve description text asynchronously, too
switch inotify/kevent stuff to v5.12
manifest: update module blurb + v5.12
lei_mirror: simplify _get_txt_start callers
lei_mirror: elide description retrieval for v1|coderepo
lei_mirror: add a hint for skipped epoch permissions
lei_mirror: consolidate clone process management
lei_mirror: load File::Path unconditionally
lei_mirror: load most modules up-front
lei_mirror: set gitweb.owner from manifest
clone: support --dry-run / -n flag
lei_mirror: initialize placeholders with "head" from manifest
lei_mirror: support {reference} for v1 manifest clones
lei_mirror: reduce noise on interrupted clones
clone: support --inbox-config option
lei_mirror: retrieve v2 description properly
lei_mirror: reduce scope of v2 lock
lei_mirror: allow --epoch on mixed v1/v2 clones
lei_mirror: fix infinite loop in dependency resolution
lei_mirror: defend against infinite loops
lei_mirror: do not fetch descriptions if using manifest
lei_mirror: require PublicInbox::Lock at use
lei_mirror: fix glob semantics to match end-of-path
lei_mirror: differentiate -entv vs -ent
lei_mirror: support manifest {references} for v2 epochs
lei_mirror: simplify v2 code paths
clone: support --inbox-version
lei_mirror: require Perl v5.12+
lei_mirror: ensure curl exits 22 on HTTP 404 responses
lei_mirror: cleanup File::Temp OO usage
lei_mirror: add `index' target to generated Makefile
lei_mirror: do not write Makefile for --inbox-config=never
lei_mirror: hoist out dump_manifest sub
lei_mirror: avoid convoluted lazy_cb usage
lei_mirror: simplify clone_v2_prep
lei_mirror: support --objstore and forkgroups
lei_mirror: cleanup process reaping logic
lei_mirror: ensure git <1.8.5 fallback can use torsocks
clone: flesh out --objstore behavior and document
lei_mirror: always pack refs for coderepos
lei_mirror: set description for non-inboxes, too
lei_mirror: force --no-tags when fetching forkgroups
lei_mirror: preserve permissions of existing alternates file
lei_mirror: do not show ref updates w/o --verbose
lei_mirror: drop git <1.8.5 support
lei_mirror: make basename more descriptive
lei_mirror: fix --dry-run for forkgroups
lei_mirror: forkgroups use `git fetch --multiple'
clone: move --dry-run handling to lei_mirror
clone: drop unnecessary requires
clone: use v5.12
clone: require `--objstore=' for default location
lei_mirror: shorten remote names
fetch: use v5.12
fetch: eliminate File::Temp->filename var
lei_mirror: properly pack-refs in non-forkgroup repos
lei_mirror: show child error error code
on_destroy: support ->cancel callback
lei_mirror: support resuming multi-repo clones
lei_mirror: check fingerprints before fetching
clone: support loading manifest.js.gz from destination
lei_mirror: delay configuring forkgroups
clone: canonicalize destination path from CLI
clone|fetch: support passing --prune(-tags) to `git fetch'
lei_mirror: avoid needless FD passing
clone: support --keep-going/-k like make(1)
lei_mirror: don't warn on missing manifest on initial clone
lei_mirror: respect `./' and `../' prefixes for CLI args
lei_mirror: --manifest= affects destination, too
lei_mirror: update fingerprints when writing local manifest.js.gz
lei_mirror: remove janky mirror.done stamp file
lei_mirror: simplify most process spawning
lei_mirror: run v1_done earlier on forkgroup done
lei_mirror: simplify forkgroup-related subs
lei_mirror: shorten scope mirror objects
lei_mirror: set {head} from manifest
lei_mirror: support {symlinks} from manifest
lei_mirror: eliminate circular references
lei_mirror: use curl -z/--timecond if manifest exists
lei_mirror: avoid redundant curl `-f' use
lei_mirror: omit trailing slash for git remote.*.url
lei_mirror: set info/web/last-modified from manifest
lei_mirror: don't clobber inbox.config.example if it exists
lei_mirror: break out of fgrp fetch iteration early
clone: support --project-list= for cgit
lei_mirror: handle forkgroup changes
Documentation/lei-add-external.pod | 4 +-
Documentation/public-inbox-clone.pod | 76 ++
Documentation/public-inbox-fetch.pod | 6 +
lib/PublicInbox/DSKQXS.pm | 5 +-
lib/PublicInbox/DirIdle.pm | 4 +-
lib/PublicInbox/FakeInotify.pm | 13 +-
lib/PublicInbox/Fetch.pm | 50 +-
lib/PublicInbox/In2Tie.pm | 4 +-
lib/PublicInbox/InboxIdle.pm | 2 +-
lib/PublicInbox/KQNotify.pm | 12 +-
lib/PublicInbox/LEI.pm | 5 +-
lib/PublicInbox/LeiMirror.pm | 1104 +++++++++++++++++++++-----
lib/PublicInbox/ManifestJsGz.pm | 8 +-
lib/PublicInbox/OnDestroy.pm | 5 +-
lib/PublicInbox/TestCommon.pm | 1 +
script/public-inbox-clone | 23 +-
script/public-inbox-fetch | 4 +-
t/on_destroy.t | 8 +-
t/www_listing.t | 71 +-
19 files changed, 1148 insertions(+), 257 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2022-11-28 5:30 7% [PATCH 00/95] clone: multi-inbox/repo support Eric Wong
2022-11-28 5:31 6% ` [PATCH 36/95] clone: support --inbox-version Eric Wong
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).