X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FV2Writable.pm;h=b45d272263b33b72062a054cc23dea7593c558fd;hp=33c0038d18ebac631c2b2a9c84f55222d5d3d5ac;hb=b5bc3576af3d0ef0fa884ed32a674c7a703a19b2;hpb=96a8b8832d791d53e05f235b5bc2492daab5f60a diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 33c0038d..b45d2722 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2019 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ # This interface wraps and mimics PublicInbox::Import @@ -7,6 +7,7 @@ package PublicInbox::V2Writable; use strict; use warnings; use base qw(PublicInbox::Lock); +use 5.010_001; use PublicInbox::SearchIdxShard; use PublicInbox::MIME; use PublicInbox::Git; @@ -16,9 +17,11 @@ use PublicInbox::ContentId qw(content_id content_digest); use PublicInbox::Inbox; use PublicInbox::OverIdx; use PublicInbox::Msgmap; -use PublicInbox::Spawn qw(spawn); +use PublicInbox::Spawn qw(spawn popen_rd); use PublicInbox::SearchIdx; -use IO::Handle; +use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp); +use IO::Handle; # ->autoflush +use File::Temp qw(tempfile); # an estimate of the post-packed size to the raw uncompressed size my $PACKING_FACTOR = 0.4; @@ -31,19 +34,29 @@ my $PACKING_FACTOR = 0.4; # to increase Xapian shards our $NPROC_MAX_DEFAULT = 4; -sub nproc_shards ($) { - my ($creat_opt) = @_; - if (ref($creat_opt) eq 'HASH') { - if (defined(my $n = $creat_opt->{nproc})) { - return $n - } +sub detect_nproc () { + for my $nproc (qw(nproc gnproc)) { # GNU coreutils nproc + `$nproc 2>/dev/null` =~ /^(\d+)$/ and return $1; } - my $n = $ENV{NPROC}; + # getconf(1) is POSIX, but *NPROCESSORS* vars are not + for (qw(_NPROCESSORS_ONLN NPROCESSORS_ONLN)) { + `getconf $_ 2>/dev/null` =~ /^(\d+)$/ and return $1; + } + + # should we bother with `sysctl hw.ncpu`? Those only give + # us total processor count, not online processor count. + undef +} + +sub nproc_shards ($) { + my ($creat_opt) = @_; + my $n = $creat_opt->{nproc} if ref($creat_opt) eq 'HASH'; + $n //= $ENV{NPROC}; if (!$n) { - chomp($n = `nproc 2>/dev/null`); - # assume 2 cores if GNU nproc(1) is not available - $n = 2 if !$n; + # assume 2 cores if not detectable or zero + state $NPROC_DETECTED = detect_nproc() || 2; + $n = $NPROC_DETECTED; $n = $NPROC_MAX_DEFAULT if $n > $NPROC_MAX_DEFAULT; } @@ -61,10 +74,13 @@ sub count_shards ($) { # Also, shard count may change while -watch is running # due to "xcpdb --reshard" if (-d $xpfx) { + require PublicInbox::Search; + PublicInbox::Search::load_xapian(); + my $XapianDatabase = $PublicInbox::Search::X{Database}; foreach my $shard (<$xpfx/*>) { -d $shard && $shard =~ m!/[0-9]+\z! or next; eval { - Search::Xapian::Database->new($shard)->close; + $XapianDatabase->new($shard)->close; $n++; }; } @@ -76,7 +92,8 @@ sub new { # $creat may be any true value, or 0/undef. A hashref is true, # and $creat->{nproc} may be set to an integer my ($class, $v2ibx, $creat) = @_; - my $dir = $v2ibx->{inboxdir} or die "no inboxdir in inbox\n"; + $v2ibx = PublicInbox::InboxWritable->new($v2ibx); + my $dir = $v2ibx->assert_usable_dir; unless (-d $dir) { if ($creat) { require File::Path; @@ -85,8 +102,6 @@ sub new { die "$dir does not exist\n"; } } - - $v2ibx = PublicInbox::InboxWritable->new($v2ibx); $v2ibx->umask_prepare; my $xpfx = "$dir/xap" . PublicInbox::Search::SCHEMA_VERSION; @@ -109,8 +124,11 @@ sub new { # public (for now?) sub init_inbox { - my ($self, $parallel, $skip_epoch) = @_; - $self->{parallel} = $parallel; + my ($self, $shards, $skip_epoch) = @_; + if (defined $shards) { + $self->{parallel} = 0 if $shards == 0; + $self->{shards} = $shards if $shards > 0; + } $self->idx_init; my $epoch_max = -1; git_dir_latest($self, \$epoch_max); @@ -131,12 +149,14 @@ sub add { } # indexes a message, returns true if checkpointing is needed -sub do_idx ($$$$$$$) { - my ($self, $msgref, $mime, $len, $num, $oid, $mid0) = @_; - $self->{over}->add_overview($mime, $len, $num, $oid, $mid0); - my $idx = idx_shard($self, $num % $self->{shards}); - $idx->index_raw($len, $msgref, $num, $oid, $mid0, $mime); - my $n = $self->{transact_bytes} += $len; +sub do_idx ($$$$) { + my ($self, $msgref, $mime, $smsg) = @_; + $smsg->{ds} //= msg_datestamp($mime->header_obj, $self->{autime}); + $smsg->{ts} //= msg_timestamp($mime->header_obj, $self->{cotime}); + $self->{over}->add_overview($mime, $smsg); + my $idx = idx_shard($self, $smsg->{num} % $self->{shards}); + $idx->index_raw($msgref, $mime, $smsg); + my $n = $self->{transact_bytes} += $smsg->{bytes}; $n >= (PublicInbox::SearchIdx::BATCH_BYTES * $self->{shards}); } @@ -159,12 +179,13 @@ sub _add { defined $num or return; # duplicate defined $mid0 or die "BUG: $mid0 undefined\n"; my $im = $self->importer; - my $cmt = $im->add($mime); + my $smsg = bless { mid => $mid0, num => $num }, 'PublicInbox::Smsg'; + my $cmt = $im->add($mime, undef, $smsg); # sets $smsg->{ds|ts|blob} $cmt = $im->get_mark($cmt); $self->{last_commit}->[$self->{epoch_max}] = $cmt; - my ($oid, $len, $msgref) = @{$im->{last_object}}; - if (do_idx($self, $msgref, $mime, $len, $num, $oid, $mid0)) { + my $msgref = delete $smsg->{-raw_email}; + if (do_idx($self, $msgref, $mime, $smsg)) { $self->checkpoint; } @@ -184,11 +205,10 @@ sub v2_num_for { # crap, Message-ID is already known, hope somebody just resent: foreach my $m (@$mids) { # read-only lookup now safe to do after above barrier - my $existing = lookup_content($self, $mime, $m); # easy, don't store duplicates # note: do not add more diagnostic info here since # it gets noisy on public-inbox-watch restarts - return () if $existing; + return () if content_exists($self, $mime, $m); } # AltId may pre-populate article numbers (e.g. X-Mail-Count @@ -364,7 +384,7 @@ sub rewrite_internal ($$;$$$) { } my $over = $self->{over}; my $cids = content_ids($old_mime); - my $removed; + my @removed; my $mids = mids($old_mime->header_obj); # We avoid introducing new blobs into git since the raw content @@ -374,7 +394,7 @@ sub rewrite_internal ($$;$$$) { my $mark; foreach my $mid (@$mids) { - my %gone; # num => [ smsg, raw ] + my %gone; # num => [ smsg, $mime, raw ] my ($id, $prev); while (my $smsg = $over->next_by_mid($mid, \$id, \$prev)) { my $msg = get_blob($self, $smsg); @@ -385,8 +405,7 @@ sub rewrite_internal ($$;$$$) { my $orig = $$msg; my $cur = PublicInbox::MIME->new($msg); if (content_matches($cids, $cur)) { - $smsg->{mime} = $cur; - $gone{$smsg->{num}} = [ $smsg, \$orig ]; + $gone{$smsg->{num}} = [ $smsg, $cur, \$orig ]; } } my $n = scalar keys %gone; @@ -396,15 +415,16 @@ sub rewrite_internal ($$;$$$) { join(',', sort keys %gone), "\n"; } foreach my $num (keys %gone) { - my ($smsg, $orig) = @{$gone{$num}}; - # $removed should only be set once assuming + my ($smsg, $mime, $orig) = @{$gone{$num}}; + # @removed should only be set once assuming # no bugs in our deduplication code: - $removed = $smsg; + @removed = (undef, $mime, $smsg); my $oid = $smsg->{blob}; if ($replace_map) { $replace_map->{$oid} = $sref; } else { ($mark, undef) = $im->remove($orig, $cmt_msg); + $removed[0] = $mark; } $orig = undef; if ($need_reindex) { # ->replace @@ -424,15 +444,18 @@ sub rewrite_internal ($$;$$$) { my $rewrites = _replace_oids($self, $new_mime, $replace_map); return { rewrites => $rewrites, need_reindex => $need_reindex }; } - $removed; + defined($mark) ? @removed : undef; } -# public +# public (see PublicInbox::Import->remove), but note the 3rd element +# (retval[2]) is not part of the stable API shared with Import->remove sub remove { my ($self, $mime, $cmt_msg) = @_; + my @ret; $self->{-inbox}->with_umask(sub { - rewrite_internal($self, $mime, $cmt_msg); + @ret = rewrite_internal($self, $mime, $cmt_msg); }); + defined($ret[0]) ? @ret : undef; } sub _replace ($$;$$) { @@ -468,17 +491,12 @@ sub git_hash_raw ($$) { print $tmp_fh $$raw or die "print \$tmp_fh: $!"; sysseek($tmp_fh, 0, 0) or die "seek failed: $!"; - my ($r, $w); - pipe($r, $w) or die "failed to create pipe: $!"; - my $rdr = { 0 => fileno($tmp_fh), 1 => fileno($w) }; my $git_dir = $self->{-inbox}->git->{git_dir}; my $cmd = ['git', "--git-dir=$git_dir", qw(hash-object --stdin)]; - my $pid = spawn($cmd, undef, $rdr); - close $w; + my $r = popen_rd($cmd, undef, { 0 => $tmp_fh }); local $/ = "\n"; chomp(my $oid = <$r>); - waitpid($pid, 0) == $pid or die "git hash-object did not finish"; - die "git hash-object failed: $?" if $?; + close $r or die "git hash-object failed: $?"; $oid =~ /\A[a-f0-9]{40}\z/ or die "OID not expected: $oid"; $oid; } @@ -537,17 +555,21 @@ W: $list } # make sure we really got the OID: - my ($oid, $type, $len) = $self->{-inbox}->git->check($expect_oid); - $oid eq $expect_oid or die "BUG: $expect_oid not found after replace"; + my ($blob, $type, $bytes) = $self->{-inbox}->git->check($expect_oid); + $blob eq $expect_oid or die "BUG: $expect_oid not found after replace"; # don't leak FDs to Xapian: $self->{-inbox}->git->cleanup; # reindex modified messages: for my $smsg (@$need_reindex) { - my $num = $smsg->{num}; - my $mid0 = $smsg->{mid}; - do_idx($self, \$raw, $new_mime, $len, $num, $oid, $mid0); + my $new_smsg = bless { + blob => $blob, + bytes => $bytes, + num => $smsg->{num}, + mid => $smsg->{mid}, + }, 'PublicInbox::Smsg'; + do_idx($self, \$raw, $new_mime, $new_smsg); } $rewritten->{rewrites}; } @@ -665,23 +687,43 @@ sub fill_alternates ($$) { unless (-d $all) { PublicInbox::Import::init_bare($all); } - my $alt = "$all/objects/info/alternates"; - my %alts; - my @add; + my $info_dir = "$all/objects/info"; + my $alt = "$info_dir/alternates"; + my (%alt, $new); + my $mode = 0644; if (-e $alt) { open(my $fh, '<', $alt) or die "open < $alt: $!\n"; - %alts = map { chomp; $_ => 1 } (<$fh>); + $mode = (stat($fh))[2] & 07777; + + # we assign a sort score to every alternate and favor + # the newest (highest numbered) one when we + my $score; + my $other = 0; # in case admin adds non-epoch repos + %alt = map {; + if (m!\A\Q../../\E([0-9]+)\.git/objects\z!) { + $score = $1 + 0; + } else { + $score = --$other; + } + $_ => $score; + } split(/\n+/, do { local $/; <$fh> }); } + foreach my $i (0..$epoch) { my $dir = "../../git/$i.git/objects"; - push @add, $dir if !$alts{$dir} && -d "$pfx/$i.git"; - } - return unless @add; - open my $fh, '>>', $alt or die "open >> $alt: $!\n"; - foreach my $dir (@add) { - print $fh "$dir\n" or die "print >> $alt: $!\n"; + if (!exists($alt{$dir}) && -d "$pfx/$i.git") { + $alt{$dir} = $i; + $new = 1; + } } - close $fh or die "close $alt: $!\n"; + return unless $new; + + my ($fh, $tmp) = tempfile('alt-XXXXXXXX', DIR => $info_dir); + print $fh join("\n", sort { $alt{$b} <=> $alt{$a} } keys %alt), "\n" + or die "print $tmp: $!\n"; + chmod($mode, $fh) or die "fchmod $tmp: $!\n"; + close $fh or die "close $tmp $!\n"; + rename($tmp, $alt) or die "rename $tmp => $alt: $!\n"; } sub git_init { @@ -753,7 +795,6 @@ sub import_init { my ($self, $git, $packed_bytes, $tmp) = @_; my $im = PublicInbox::Import->new($git, undef, undef, $self->{-inbox}); $im->{bytes_added} = int($packed_bytes / $PACKING_FACTOR); - $im->{want_object_info} = 1; $im->{lock_path} = undef; $im->{path_type} = 'v2'; $self->{im} = $im unless $tmp; @@ -763,7 +804,6 @@ sub import_init { # XXX experimental sub diff ($$$) { my ($mid, $cur, $new) = @_; - use File::Temp qw(tempfile); my ($ah, $an) = tempfile('email-cur-XXXXXXXX', TMPDIR => 1); print $ah $cur->as_string or die "print: $!"; @@ -775,7 +815,6 @@ sub diff ($$$) { my $cmd = [ qw(diff -u), $an, $bn ]; print STDERR "# MID conflict <$mid>\n"; my $pid = spawn($cmd, undef, { 1 => 2 }); - defined $pid or die "diff failed to spawn $!"; waitpid($pid, 0) == $pid or die "diff did not finish"; unlink($an, $bn); } @@ -791,7 +830,7 @@ sub get_blob ($$) { $ibx->msg_by_smsg($smsg); } -sub lookup_content ($$$) { +sub content_exists ($$$) { my ($self, $mime, $mid) = @_; my $over = $self->{over}; my $cids = content_ids($mime); @@ -803,11 +842,7 @@ sub lookup_content ($$$) { next; } my $cur = PublicInbox::MIME->new($msg); - if (content_matches($cids, $cur)) { - $smsg->{mime} = $cur; - return $smsg; - } - + return 1 if content_matches($cids, $cur); # XXX DEBUG_DIFF is experimental and may be removed diff($mid, $cur, $mime) if $ENV{DEBUG_DIFF}; @@ -859,8 +894,9 @@ sub reindex_checkpoint ($$$) { } # only for a few odd messages with multiple Message-IDs -sub reindex_oid_m ($$$$) { - my ($self, $sync, $git, $oid) = @_; +sub reindex_oid_m ($$$$;$) { + my ($self, $sync, $git, $oid, $regen_num) = @_; + $self->{current_info} = "multi_mid $oid"; my ($num, $mid0, $len); my $msgref = $git->cat_file($oid, \$len); my $mime = PublicInbox::MIME->new($$msgref); @@ -872,53 +908,61 @@ sub reindex_oid_m ($$$$) { delete($sync->{D}->{"$mid\0$cid"}) and die "BUG: reindex_oid should handle <$mid> delete"; } + my $over = $self->{over}; for my $mid (reverse @$mids) { - ($num, $mid0) = $self->{over}->num_mid0_for_oid($oid, $mid); - last if defined $num; + ($num, $mid0) = $over->num_mid0_for_oid($oid, $mid); + next unless defined $num; + if (defined($regen_num) && $regen_num != $num) { + die "BUG: regen(#$regen_num) != over(#$num)"; + } } unless (defined($num)) { for my $mid (reverse @$mids) { # is this a number we got before? - $num = $sync->{mm_tmp}->num_for($mid); - next unless defined $num; - $mid0 = $mid; + my $n = $sync->{mm_tmp}->num_for($mid); + next unless defined $n; + next if defined($regen_num) && $regen_num != $n; + ($num, $mid0) = ($n, $mid); last; } } if (defined($num)) { $sync->{mm_tmp}->num_delete($num); - } else { - $num = $sync->{regen}--; - if ($num <= 0) { - # fixup bugs in old mirrors on reindex - for my $mid (reverse @$mids) { - $num = $self->{mm}->mid_insert($mid); - next unless defined $num; - $mid0 = $mid; - last; - } - if (defined $mid0) { - if ($sync->{reindex}) { - warn "reindex added #$num <$mid0>\n"; - } - } else { - warn "E: cannot find article #\n"; - return; - } - } else { # $num > 0, use the new article number - for my $mid (reverse @$mids) { - $self->{mm}->mid_set($num, $mid) == 1 or next; - $mid0 = $mid; - last; - } - unless (defined $mid0) { - warn "E: cannot regen #$num\n"; - return; + } elsif (defined $regen_num) { + $num = $regen_num; + for my $mid (reverse @$mids) { + $self->{mm}->mid_set($num, $mid) == 1 or next; + $mid0 = $mid; + last; + } + unless (defined $mid0) { + warn "E: cannot regen #$num\n"; + return; + } + } else { # fixup bugs in old mirrors on reindex + for my $mid (reverse @$mids) { + $num = $self->{mm}->mid_insert($mid); + next unless defined $num; + $mid0 = $mid; + last; + } + if (defined $mid0) { + if ($sync->{reindex}) { + warn "reindex added #$num <$mid0>\n"; } + } else { + warn "E: cannot find article #\n"; + return; } } $sync->{nr}++; - if (do_idx($self, $msgref, $mime, $len, $num, $oid, $mid0)) { + my $smsg = bless { + bytes => $len, + num => $num, + blob => $oid, + mid => $mid0, + }, 'PublicInbox::Smsg'; + if (do_idx($self, $msgref, $mime, $smsg)) { reindex_checkpoint($self, $sync, $git); } } @@ -935,6 +979,30 @@ sub check_unindexed ($$$) { } } +# reuse Msgmap to store num => oid mapping (rather than num => mid) +sub multi_mid_q_new () { + my ($fh, $fn) = tempfile('multi_mid-XXXXXXX', EXLOCK => 0, TMPDIR => 1); + my $multi_mid = PublicInbox::Msgmap->new_file($fn, 1); + $multi_mid->{dbh}->do('PRAGMA synchronous = OFF'); + # for Msgmap->DESTROY: + $multi_mid->{tmp_name} = $fn; + $multi_mid->{pid} = $$; + close $fh or die "failed to close $fn: $!"; + $multi_mid +} + +sub multi_mid_q_push ($$) { + my ($sync, $oid) = @_; + my $multi_mid = $sync->{multi_mid} //= multi_mid_q_new(); + if ($sync->{reindex}) { # no regen on reindex + $multi_mid->mid_insert($oid); + } else { + my $num = $sync->{regen}--; + die "BUG: ran out of article numbers" if $num <= 0; + $multi_mid->mid_set($num, $oid); + } +} + sub reindex_oid ($$$$) { my ($self, $sync, $git, $oid) = @_; my ($num, $mid0, $len); @@ -966,7 +1034,7 @@ sub reindex_oid ($$$$) { check_unindexed($self, $num, $mid0); } else { $num = $sync->{regen}--; - die "BUG: ran out of article numbers\n" if $num <= 0; + die "BUG: ran out of article numbers" if $num <= 0; if ($self->{mm}->mid_set($num, $mid) != 1) { warn "E: unable to assign $num => <$mid>\n"; return; @@ -983,14 +1051,20 @@ sub reindex_oid ($$$$) { # do not delete from {mm_tmp}, since another # single-MID message may use it. } else { # handle them at the end: - push @{$sync->{multi_mid} //= []}, $oid; + multi_mid_q_push($sync, $oid); } return; } $sync->{mm_tmp}->mid_delete($mid0) or die "failed to delete <$mid0> for article #$num\n"; $sync->{nr}++; - if (do_idx($self, $msgref, $mime, $len, $num, $oid, $mid0)) { + my $smsg = bless { + bytes => $len, + num => $num, + blob => $oid, + mid => $mid0, + }, 'PublicInbox::Smsg'; + if (do_idx($self, $msgref, $mime, $smsg)) { reindex_checkpoint($self, $sync, $git); } } @@ -1102,6 +1176,7 @@ sub sync_prepare ($$$) { --no-notes --no-color --no-renames --diff-filter=AM), $range, '--', 'm'); ++$n while <$fh>; + close $fh or die "git log failed: \$?=$?"; $pr->("$n\n") if $pr; $regen_max += $n; } @@ -1169,7 +1244,7 @@ sub unindex ($$$$) { unindex_oid($self, $git, $1, $unindexed); } delete $self->{reindex_pipe}; - $fh = undef; + close $fh or die "git log failed: \$?=$?"; return unless $sync->{-opt}->{prune}; my $after = scalar keys %$unindexed; @@ -1177,7 +1252,7 @@ sub unindex ($$$$) { # ensure any blob can not longer be accessed via dumb HTTP PublicInbox::Import::run_die(['git', "--git-dir=$git->{git_dir}", - qw(-c gc.reflogExpire=now gc --prune=all)]); + qw(-c gc.reflogExpire=now gc --prune=all --quiet)]); } sub sync_ranges ($$$) { @@ -1210,22 +1285,24 @@ sub index_epoch ($$$) { $pr->("$i.git indexing $range\n"); } - my @cmd = qw(log --raw -r --pretty=tformat:%H + my @cmd = qw(log --raw -r --pretty=tformat:%H.%at.%ct --no-notes --no-color --no-abbrev --no-renames); my $fh = $self->{reindex_pipe} = $git->popen(@cmd, $range); my $cmt; while (<$fh>) { chomp; $self->{current_info} = "$i.git $_"; - if (/\A$x40$/o && !defined($cmt)) { - $cmt = $_; + if (/\A($x40)\.([0-9]+)\.([0-9]+)$/o) { + $cmt //= $1; + $self->{autime} = $2; + $self->{cotime} = $3; } elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) { reindex_oid($self, $sync, $git, $1); } elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\td$/o) { mark_deleted($self, $sync, $git, $1); } } - $fh = undef; + close $fh or die "git log failed: \$?=$?"; delete $self->{reindex_pipe}; update_last_commit($self, $git, $i, $cmt) if defined $cmt; } @@ -1275,10 +1352,21 @@ sub index_sync { } if (my $multi_mid = delete $sync->{multi_mid}) { $git //= $self->{-inbox}->git; - - while (defined(my $oid = pop(@$multi_mid))) { - $self->{current_info} = "multi_mid $oid"; - reindex_oid_m($self, $sync, $git, $oid); + my ($min, $max) = $multi_mid->minmax; + if ($sync->{reindex}) { + # we may need to create new Message-IDs if mirrors + # were initially indexed with old versions + for (my $i = $max; $i >= $min; $i--) { + my $oid = $multi_mid->mid_for($i); + next unless defined $oid; + reindex_oid_m($self, $sync, $git, $oid); + } + } else { # regen on initial index + for my $num ($min..$max) { + my $oid = $multi_mid->mid_for($num); + next unless defined $oid; + reindex_oid_m($self, $sync, $git, $oid, $num); + } } } $git->cleanup if $git;