git: reload alternates file on missing blob

Since we'll be adding new repositories to the `alternates' file
in git, we must restart the `git cat-file --batch' process as
git currently does not detect changes to the alternates file
in long-running cat-file processes.

Don't bother with the `--batch-check' process since we won't be
using it with v2.

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 6437643d88fb9840c69cce1a3784ab48ab6ca711..95df52ed6f2fd9f2b058d404d4358acebf0532c2 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -15,7 +15,19 @@ use PublicInbox::Spawn qw(spawn popen_rd);
 
 sub new {
        my ($class, $git_dir) = @_;
-       bless { git_dir => $git_dir }, $class
+       my @st;
+       $st[7] = $st[10] = 0;
+       bless { git_dir => $git_dir, st => \@st }, $class
+}
+
+sub alternates_changed {
+       my ($self) = @_;
+       my $alt = "$self->{git_dir}/objects/info/alternates";
+       my @st = stat($alt) or return 0;
+       my $old_st = $self->{st};
+       # 10 - ctime, 7 - size
+       return 0 if ($st[10] == $old_st->[10] && $st[7] == $old_st->[7]);
+       $self->{st} = \@st;
 }
 
 sub _bidi_pipe {
@@ -38,14 +50,23 @@ sub _bidi_pipe {
 
 sub cat_file {
        my ($self, $obj, $ref) = @_;
+       my ($retried, $in, $head);
 
+again:
        batch_prepare($self);
        $self->{out}->print($obj, "\n") or fail($self, "write error: $!");
 
-       my $in = $self->{in};
+       $in = $self->{in};
        local $/ = "\n";
-       my $head = $in->getline;
-       $head =~ / missing$/ and return undef;
+       $head = $in->getline;
+       if ($head =~ / missing$/) {
+               if (!$retried && alternates_changed($self)) {
+                       $retried = 1;
+                       cleanup($self);
+                       goto again;
+               }
+               return;
+       }
        $head =~ /^[0-9a-f]{40} \S+ (\d+)$/ or
                fail($self, "Unexpected result from git cat-file: $head");
 

diff --git a/t/git.t b/t/git.t
index ab588a15b603d86e6bb2281e4476ccb48340317a..7f96293fb25a1511452ce1e242822afa5791b49f 100644 (file)
--- a/t/git.t
+++ b/t/git.t
@@ -6,6 +6,7 @@ use Test::More;
 use File::Temp qw/tempdir/;
 my $dir = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 use Cwd qw/getcwd/;
+use PublicInbox::Spawn qw(popen_rd);
 
 use_ok 'PublicInbox::Git';
 {
@@ -142,4 +143,24 @@ if (1) {
        ok($gcf->packed_bytes > 0, 'packed size is positive');
 }
 
+if ('alternates reloaded') {
+       my $alt = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+       my @cmd = ('git', "--git-dir=$alt", qw(hash-object -w --stdin));
+       is(system(qw(git init -q --bare), $alt), 0, 'create alt directory');
+       open my $fh, '<', "$alt/config" or die "open failed: $!\n";
+       my $rd = popen_rd(\@cmd, {}, { 0 => fileno($fh) } );
+       close $fh or die "close failed: $!";
+       chomp(my $remote = <$rd>);
+       my $gcf = PublicInbox::Git->new($dir);
+       is($gcf->cat_file($remote), undef, "remote file not found");
+       open $fh, '>>', "$dir/objects/info/alternates" or
+                       die "open failed: $!\n";
+       print $fh "$alt/objects" or die "print failed: $!\n";
+       close $fh or die "close failed: $!";
+       my $found = $gcf->cat_file($remote);
+       open $fh, '<', "$alt/config" or die "open failed: $!\n";
+       my $config = eval { local $/; <$fh> };
+       is($$found, $config, 'alternates reloaded');
+}
+
 done_testing();