* [PATCH 00/95] clone: multi-inbox/repo support...
@ 2022-11-28 5:30 7% Eric Wong
2022-11-28 5:30 6% ` [PATCH 02/95] clone: support --include and --exclude with multi-clone 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%]
* [PATCH 02/95] clone: support --include and --exclude with multi-clone
2022-11-28 5:30 7% [PATCH 00/95] clone: multi-inbox/repo support Eric Wong
@ 2022-11-28 5:30 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2022-11-28 5:30 UTC (permalink / raw)
To: meta
These will be handy when someone is interested in a subset of
inboxes on a large hosting site.
---
Documentation/public-inbox-clone.pod | 14 +++++++++++++
lib/PublicInbox/LeiMirror.pm | 31 +++++++++++++++++++++++++---
script/public-inbox-clone | 2 +-
t/www_listing.t | 22 ++++++++++++++++++++
4 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/Documentation/public-inbox-clone.pod b/Documentation/public-inbox-clone.pod
index c80c3c5f..7e95146e 100644
--- a/Documentation/public-inbox-clone.pod
+++ b/Documentation/public-inbox-clone.pod
@@ -51,6 +51,20 @@ C<--epoch=~2..> clones the three latest epochs.
Default: C<0..~0> or C<0..> or C<..~0>
(all epochs, all three examples are equivalent)
+=item -I PATTERN
+
+=item --include=PATTERN
+
+When cloning a top-level with multiple inboxes, only clone inboxes and
+repositories matching a given wildcard pattern (using C<*?> and C<[]> is
+supported).
+
+=item --exclude=PATTERN
+
+When cloning a top-level with multiple inboxes, ignore inboxes and
+repositories matching the given wildcard pattern. Supports the same
+wildcards as L</--include>
+
=item -q
=item --quiet
diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index e356b5c5..d5017642 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -347,6 +347,8 @@ sub decode_manifest ($$$) {
sub multi_inbox ($$$) {
my ($self, $path, $m) = @_;
+ my $incl = $self->{lei}->{opt}->{include};
+ my $excl = $self->{lei}->{opt}->{exclude};
# assuming everything not v2 is v1, for now
my @v1 = sort grep(!m!.+/git/[0-9]+\.git\z!, keys %$m);
@@ -354,13 +356,35 @@ sub multi_inbox ($$$) {
my $v2 = {};
for (@v2_epochs) {
- m!\A/(.+)/git/[0-9]+\.git\z! or die "BUG: $_";
+ m!\A(/.+)/git/[0-9]+\.git\z! or die "BUG: $_";
push @{$v2->{$1}}, $_;
}
my $n = scalar(keys %$v2) + scalar(@v1);
- my $ret; # { v1 => [ ... ], v2 => { $inbox_name => [ epochs ] }}
+ my @orig = defined($incl // $excl) ? (keys %$v2, @v1) : ();
+ if (defined $incl) {
+ my $re = '(?:'.join('|', map {
+ $self->{lei}->glob2re($_) // qr/\A\Q$_\E\z/
+ } @$incl).')';
+ 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;
+ @v1 = grep(/$re/, @v1);
+ }
+ if (defined $excl) {
+ my $re = '(?:'.join('|', map {
+ $self->{lei}->glob2re($_) // qr/\A\Q$_\E\z/
+ } @$excl).')';
+ 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;
+ @v1 = grep(!/$re/, @v1);
+ }
+ my $ret; # { v1 => [ ... ], v2 => { "/$inbox_name" => [ epochs ] }}
$ret->{v1} = \@v1 if @v1;
$ret->{v2} = $v2 if keys %$v2;
+ $ret //= @orig ? "Nothing to clone, available repositories:\n\t".
+ join("\n\t", sort @orig)
+ : "Nothing available to clone\n";
my $path_pfx = '';
# PSGI mount prefixes and manifest.js.gz prefixes don't always align...
@@ -407,6 +431,7 @@ sub try_manifest {
return try_scrape($self);
}
my ($path_pfx, $n, $multi) = multi_inbox($self, \$path, $m);
+ return $lei->child_error(1, $multi) if !ref($multi);
if (my $v2 = delete $multi->{v2}) {
for my $name (sort keys %$v2) {
my $epochs = delete $v2->{$name};
@@ -449,7 +474,7 @@ EOM
clone_v1($self, 1);
}
}
- if (delete $self->{-culled_manifest}) { # set by clone_v2
+ if (delete $self->{-culled_manifest}) { # set by clone_v2/-I/--exclude
# write the smaller manifest if epochs were skipped so
# users won't have to delete manifest if they +w an
# epoch they no longer want to skip
diff --git a/script/public-inbox-clone b/script/public-inbox-clone
index 54059d03..4244e0c8 100755
--- a/script/public-inbox-clone
+++ b/script/public-inbox-clone
@@ -21,7 +21,7 @@ options:
--quiet | -q increase verbosity (may be repeated)
-C DIR chdir to specified directory
EOF
-GetOptions($opt, qw(help|h quiet|q verbose|v+ C=s@ c=s@
+GetOptions($opt, qw(help|h quiet|q verbose|v+ C=s@ c=s@ include|I=s@ exclude=s@
no-torsocks torsocks=s epoch=s)) or die $help;
if ($opt->{help}) { print $help; exit };
require PublicInbox::Admin; # loads Config
diff --git a/t/www_listing.t b/t/www_listing.t
index e88bfbc5..e6bb1bda 100644
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -135,8 +135,29 @@ EOM
my $opt = { 2 => \(my $clone_err = '') };
ok(run_script(['-clone', "http://$host:$port/pfx", "$tmpdir/pfx" ],
undef, $opt), 'pfx clone w/pfx') or diag "clone_err=$clone_err";
+
+ open my $mh, '<', "$tmpdir/pfx/manifest.js.gz" or xbail "open: $!";
+ gunzip(\(do { local $/; <$mh> }) => \(my $mjs = ''));
+ my $mf = $json->decode($mjs);
+ is_deeply([sort keys %$mf], [ qw(/alt /bare /v2/git/0.git
+ /v2/git/1.git /v2/git/2.git) ],
+ 'manifest saved');
+ for (keys %$mf) { ok(-d "$tmpdir/pfx$_", "pfx/$_ cloned") }
+
+ $clone_err = '';
+ ok(run_script(['-clone', '--include=*/alt',
+ "http://$host:$port/pfx", "$tmpdir/incl" ],
+ undef, $opt), 'clone w/include') or diag "clone_err=$clone_err";
+ ok(-d "$tmpdir/incl/alt", 'alt cloned');
+ ok(!-d "$tmpdir/incl/v2" && !-d "$tmpdir/incl/bare", 'only alt cloned');
+
undef $td;
+ open $mh, '<', "$tmpdir/incl/manifest.js.gz" or xbail "open: $!";
+ gunzip(\(do { local $/; <$mh> }) => \($mjs = ''));
+ $mf = $json->decode($mjs);
+ is_deeply([keys %$mf], [ '/alt' ], 'excluded keys skipped in manifest');
+
$td = start_script($cmd, $env, { 3 => $sock });
# default publicinboxGrokManifest match=domain default
@@ -146,6 +167,7 @@ EOM
$clone_err = '';
ok(run_script(['-clone', "http://$host:$port/", "$tmpdir/full" ],
undef, $opt), 'full clone') or diag "clone_err=$clone_err";
+ ok(-d "$tmpdir/full/$_", "$_ cloned") for qw(alt v2 bare);
undef $td;
^ permalink raw reply related [relevance 6%]
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:30 6% ` [PATCH 02/95] clone: support --include and --exclude with multi-clone 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).