-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# This interface wraps and mimics PublicInbox::Import
use strict;
use warnings;
use base qw(PublicInbox::Lock);
+use 5.010_001;
use PublicInbox::SearchIdxShard;
use PublicInbox::MIME;
use PublicInbox::Git;
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 IO::Handle; # ->autoflush
use File::Temp qw(tempfile);
# an estimate of the post-packed size to the raw uncompressed size
# 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;
+ }
+
+ # getconf(1) is POSIX, but *NPROCESSORS* vars are not
+ for (qw(_NPROCESSORS_ONLN NPROCESSORS_ONLN)) {
+ `getconf $_ 2>/dev/null` =~ /^(\d+)$/ and return $1;
}
- my $n = $ENV{NPROC};
+ # 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;
}
# 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);
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 => $tmp_fh, 1 => $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;
}
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 {
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);
}